cockpit/js/modifiers.js in cpee-2.1.10 vs cockpit/js/modifiers.js in cpee-2.1.11

@@ -40,11 +40,11 @@
 function do_mod_save(target) {
   let div = $(target).parents('div[data-resource]');
   let top = div.attr('data-resource');
   let doc = save['modifiers_additional'][top].save();
   let rep = $('body').attr('current-resources');
-  let now = encodeURIComponent($('div.select select',div).val());
+  let now = $('div.select select',div).val();
 
   var tset = $X('<testset xmlns="http://cpee.org/ns/properties/2.0"/>');
       tset.append(doc.documentElement);
 
   set_testset(tset,false);
@@ -67,16 +67,17 @@
             url: rep + 'modifiers/' + $(r).text()
           }).then(async function(ses){
             let clone = document.importNode(document.querySelector('#modifiers template').content,true);
             let t = $(r).text();
             $('> div',clone).attr('data-resource',t);
-            $('div.title *',clone).text(decodeURIComponent(t));
+            $('div.title *',clone).text(decodeURIComponent(t).replace(/^\d*_?/,''));
 
             let cpromises = [];
             $('resource',ses).each(function(_,s) {
-              let opt = $('<option/>');
-              opt.text(decodeURIComponent($(s).text()));
+              let opt = $('<option value=""/>');
+              opt.text(decodeURIComponent($(s).text()).replace(/^\d*_?/,''));
+              opt.attr('value',$(s).text());
               $('div.select select',clone).append(opt);
 
               cpromises.push(
                 $.ajax({
                   url: rep + 'modifiers/' + $(r).text() + '/' + $(s).text() + '/condition.json'
@@ -118,11 +119,12 @@
             save['modifiers_additional'][top] = new RelaxNGui(rng, $('div.additional',r));
             let attr = save['attributes'].save();
             save['modifiers_additional'][top].content(attr);
           }
         });
-      }
+      },
+      error: function() {}
     });
   }
 }
 
 function modifiers_select() {
@@ -132,19 +134,19 @@
   $('> attributes > *',attr).each(function(_,s){
     atts[s.nodeName] = $(s).text();
   });
   $('#modifiers div[data-resource]').each(function(_,r){
     $('select option',r).each(function(_,s){
-      let where = $(r).attr('data-resource') + '/' + encodeURIComponent($(s).text());
+      let where = $(r).attr('data-resource') + '/' + $(s).attr('value');
       let cond = save['modifiers'][where];
       let success = true;
       for (x in cond) {
         if (cond[x] != atts[x]) { success = false; }
       }
       if (success) {
         let top = $(r).attr('data-resource');
-        let it = encodeURIComponent($(s).text());
-        $('select',r).val($(s).text());
+        let it = $(s).attr('value');
+        $('select',r).val(it);
         modifiers_display_ui(rep + 'modifiers/',top,it,save['modifiers_active'][top] == it);
         save['modifiers_active'][top] = it;
       }
     });
   });