[TIC-Web] Fix. Image Creation

[archive/20170607/tools/tic.git] / public / src / js / page / job.js

diff --git a/public/src/js/page/job.js b/public/src/js/page/job.js
index cfd31a0..7651d4a 100644 (file)
--- a/public/src/js/page/job.js
+++ b/public/src/js/page/job.js
@@ -9,7 +9,8 @@ define([
     '../widget/JobTableItem',
     '../widget/JobTableEmptyItem',
     '../widget/JobLog',
-    './image'
+    './image',
+    './login'
 ], function (
     $,
     _,
@@ -21,7 +22,8 @@ define([
     JobTableItem,
     JobTableEmptyItem,
     JobLog,
-    Image
+    Image,
+    Login
 ) {
     'use strict';
 
@@ -102,7 +104,7 @@ define([
                     var item;
 
                     // add the information of user's group
-                    jobItem['job_usergroup'] = UserInfo.group || USER_DEFAULT;
+                    jobItem['job_usergroup'] = _.isEmpty(UserInfo) ? USER_DEFAULT : UserInfo.group;
 
                     item = new JobModel(jobItem);
 
@@ -378,10 +380,8 @@ define([
             imageName: paramObj.pathOutput + paramObj.imageName,
             imageArch: paramObj.imageArch
         };
-
         client.emit(AppConfig.EVENT.SOCKET.FS_IMAGE_ADD_FROM, msgData);
-
-        updateList(ModelJobPaging.getCurrentPoint());
+        Login.updatePermission();
     }
 
     /**
@@ -395,17 +395,28 @@ define([
         gotoPageNum(pageNum);
     }
 
-    function updateJobInfo (user) {
-        logger.info('updateJobInfo');
+    function updateUserInfo (user) {
+        logger.info('updateUserInfo');
 
-        Util.getAppConfig().then(function (data) {
-            AppConfig = data;
-            _initSocket(Util.getWebSocket());
-            UserInfo = user;
-            updateList();
-        });
+        UserInfo = user;
+
+        updateList();
+    }
+
+    function init () {
+        logger.info('init');
+        if (_.isEmpty(AppConfig)) {
+            Util.getAppConfig().then(function (data) {
+                AppConfig = data;
+                if (_.isEmpty(client)) {
+                    _initSocket(Util.getWebSocket());
+                }
+            });
+        }
     }
 
+    init();
+
     return {
         /**
          * Update list in job page
@@ -422,7 +433,7 @@ define([
         /**
          * Update
          */
-        updateJobInfo: updateJobInfo
+        updateUserInfo: updateUserInfo
     }
 
 });
\ No newline at end of file