Changeset 6628

Timestamp:

Jan 17, 2018, 5:45:41 PM (3 years ago)

Author:

kbut

Message:

fix minor bugs

File:

• lmd/trunk/fuentes/admin-center-ltsp.install/modul/lliurex-ltsp/src/js/imageManager.js (modified) (9 diffs)

lmd/trunk/fuentes/admin-center-ltsp.install/modul/lliurex-ltsp/src/js/imageManager.js

@@ -1387 +1387 @@
             bootbox.confirm(text, function(res){
                 if (res) {
-                    debugger;
                     $("#llx-ltsp-new-image-assistant").fadeOut();
                     //alert("create image");
@@ -1399 +1398 @@
                         var req = new XMLHttpRequest();
                         var timer;
-                        req.open('POST','http://'+sessionStorage.server+'/admin-center/uploadiso.php');
+                        req.open('POST','http://'+sessionStorage.server+'/uploadiso.php');
                         req.upload.addEventListener("progress", self.progressUpload, false);
-                        req.upload.addEventListener("loadstart", self.startUpload, false);
                         req.onreadystatechange = function(){
                             if(req.readyState == 2){
@@ -1413 +1411 @@
                                         image_data['isopath'] = oRes['target'];
                                         image_data['env'] = 'VENDOR="ISO" ';
-                                        //self.createImageOnServer(id,image_data);
+                                        self.createImageOnServer(id,image_data);
                                     }
                                 }
                                 else{
-                                    
+                                    // Cancel Upload file
+                                    console.log('Upload canceled');
                                 }
                             }
@@ -1440 +1439 @@
 ImageManager.prototype.progressUpload = function progressUpload(event){
     var self = this;
-
-    console.log("Uploaded " + event.loaded + " bytes of " + event.total);
     var percent = (event.loaded / event.total) * 100;
     $("#progressIsoUpload").css({'width': percent + '%'});
-    if(percent == 100){$("#uploadIsoDialog").fadeOut(400,function(){modaldiv.remove()});}
+    if(percent == 100){$("#uploadIsoClose").click();}
 }
 
@@ -1452 +1449 @@
 
 ImageManager.prototype.createImageOnServer=function createImageOnServer(id, image_data){
-    console.log(id);
-    console.log(image_data);
     
     var credentials=[sessionStorage.username , sessionStorage.password];
@@ -1466 +1461 @@
     arglist.push(image_data.arch);
     if(image_data.hasOwnProperty('env')) arglist.push(image_data.env);
-    if(image_data.hasOwnProperty('isopath')) arglist.push(' --isopath "' + image_data.isopath + '"')
+    if(image_data.hasOwnProperty('isopath')) arglist.push(' --isopath "' + image_data.isopath + '"');
     
     Utils.n4dWithLog(credentials, n4dclass, n4dmethod, arglist, null); // no callback is needed
@@ -1653 +1648 @@
                 "i386":"",
                 "amd64":""
-            }
+            },
+            "llx_ltsp_lliurex_from_iso": "lliurex-from-iso.conf"
         };
 
@@ -1659 +1655 @@
             "llx_ltsp_lliurex_from_iso" : "ISO",
             "llx_ltsp_lliurex_minimal_image" : "mini",
-        }
+        };
 
         // Check templates
@@ -1676 +1672 @@
         If not exists template for options selected or it's not needed then template is void 
         */
-        try{ template = list_templates[id][arch] } catch(err){}
-        try{ type = type_image[id] } catch(err){}
-        
+        try{ template = list_templates[id][arch] ;} catch(err){};
+        try{ type = type_image[id] ;} catch(err){};
+        
+        if (id == 'llx_ltsp_lliurex_from_iso')
+            template = list_templates[id];
         // Setting image arch to description
         if(arch==="i386") image_desc+=" (32 bits)";