cockpit/js/instance.js in cpee-1.3.223 vs cockpit/js/instance.js in cpee-1.3.224

@@ -56,11 +56,11 @@
                'topic'  + '=' + 'handlerwrapper' + '&' +
                'events' + '=' + 'error,change' + '&' +
                'topic'  + '=' + 'handlers' + '&' +
                'events' + '=' + 'change';// }}}
 
-$(document).ready(function() {// {{{
+function cockpit() {
   if (location.protocol.match(/^file/)) {
     $("input[name=base-url]").val("http://localhost:" + $('body').data('defaultport'));
   } else {
     $("input[name=base-url]").val(location.protocol + "//" + location.hostname + ":" + $('body').data('defaultport'));
   }
@@ -123,12 +123,21 @@
         var ts = $(this).text();
         $('#modeltypes').append($("<div class='menuitem'></div>").text(ts));
       });
     }
   });
-});// }}}
+}
 
+function sanitize_url() {
+  var url = $("input[name=instance-url]").val();
+  var lastChar = url.substr(url.length - 1)
+  if (lastChar != '/') {
+    $("input[name=instance-url]").val(url + '/');
+  }
+  return $("input[name=instance-url]").val();
+}
+
 function check_subscription() { // {{{
   var url = $("#current-instance").text();
   var num = 0;
   if ($("input[name=votecontinue]").is(':checked')) num += 1;
   if (num > 0 && subscription_state == 'less') {
@@ -181,11 +190,11 @@
     }
   }
 }// }}}
 
 function monitor_instance(load,exec) {// {{{
-  var url = $("input[name=instance-url]").val();
+  var url = sanitize_url();
 
   $('.tabbehind button').hide();
   $('#dat_details').empty();
 
   $.ajax({
@@ -343,11 +352,11 @@
           url: url + "/properties/values/attributes/theme/",
           success: function(res){
             adaptor_init(url,$('value',res).text(),dslx);
           },
           error: function() {
-            adaptor_init(url,'default',dslx);
+            adaptor_init(url,'labels',dslx);
           }
         });
       }
     }
   });
@@ -570,10 +579,11 @@
                           var name = $("value > info",res).text();
                           var pars = $X('<attributes/>');
                           pars.append($(res.documentElement).children());
                           pars.find('uuid').remove();
                           testset.append(pars);
-                          $('#savetestset').attr('download',name + '.xml');
+                          var ct = new Date();
+                          $('#savetestset').attr('download',name + '_' + ct.strftime("%Y-%m-%dT%H%M%S%z") + '.xml');
                           $('#savetestset').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(testset.serializePrettyXML()));
                           document.getElementById('savetestset').click();
                         },
                         error: report_failure
                       });