Merge branch 'wrdp' into 'release'

Wrdp

See merge request o2oa/o2oa!2333

o2web/source/o2_core/o2/xAction/services/x_organization_assemble_authentication.js

@@ -43,7 +43,7 @@ MWF.xAction.RestActions.Action["x_organization_assemble_authentication"] = new C
         this.action.invoke({"name": "getAuthentication",
             "success": function(json, responseText){
                 if (json.data.tokenType!=="anonymous" || layout.anonymous){
-                    if (!json.roleList) roleList: [];
+                    if (json.data && !json.data.roleList) json.data.roleList = [];
                     if (success) success(json);
                 }else{
                     if (failure) failure(null, responseText, json.message);

o2web/source/x_component_Minder/Main.js

@@ -71,12 +71,12 @@ MWF.xApplication.Minder.Main = new Class({
                 "title": "回收站",
                 "action": "openRecycleExplorer",
                 "icon": "navi_recycle"
-            },
-            {
-                "title": "来自应用",
-                "action": "personConfig",
-                "icon": "navi_fromapp"
             }
+            // {
+            //     "title": "来自应用",
+            //     "action": "personConfig",
+            //     "icon": "navi_fromapp"
+            // }
         ];
         naviJson.each( function( d ){
             this.createNaviNode( d );

o2web/source/x_component_process_Work/Main.js

@@ -142,6 +142,7 @@ MWF.xApplication.process.Work.Main = new Class({
         }
     },
     loadWorkByWork: function(id){
+	    debugger;
         //var getWorkLogMothed = "getWorkLog";    //以前使用worklog，现在改成record了
         //var getWorkLogMothed = (this.options.worklogType.toLowerCase()==="worklog") ? "getWorkLog" : "getRecordLog";
         var loadFormFlag = false;
@@ -151,7 +152,7 @@ MWF.xApplication.process.Work.Main = new Class({
         var json_work, json_log, json_control, json_form;
 
         var check = function(){
-            if (loadWorkFlag && loadFormFlag && loadModuleFlag){
+             if (loadWorkFlag && loadFormFlag && loadModuleFlag){
                 if (json_work && json_control && json_form && json_log){
                     this.parseData(json_work.data, json_control.data, json_form.data, json_log.data, json_work.data.recordList, json_work.data.attachmentList);
                     if (this.mask) this.mask.hide();
@@ -164,7 +165,7 @@ MWF.xApplication.process.Work.Main = new Class({
                             layout.sessionPromise.then(function(){
                                 this.openWork();
                                 this.unLoading();
-                            }.bind(this));
+                            }.bind(this), function(){});
                         }
                     }
                 } else{
@@ -175,6 +176,9 @@ MWF.xApplication.process.Work.Main = new Class({
                         delete this.options.workcompletedid;
                         this.loadWork();
                     }else{
+                        layout.sessionPromise.then(function(){
+                            this.close();
+                        }.bind(this), function(){});
                         //this.close();
                     }
                 }
@@ -196,6 +200,9 @@ MWF.xApplication.process.Work.Main = new Class({
                     loadFormFlag = true;
                     check();
                 }.bind(this), "failure": function(){
+                    layout.sessionPromise.then(function(){
+                        this.close();
+                    }.bind(this), function(){});
                     //this.close();
                 }.bind(this)}, id, id, id, [this.options.formid || this.options.form.id]);
         }else{
@@ -242,6 +249,9 @@ MWF.xApplication.process.Work.Main = new Class({
                         loadWorkFlag = true;
                         check();
                     }.bind(this), "failure": function(){
+                        layout.sessionPromise.then(function(){
+                            this.close();
+                        }.bind(this), function(){});
                         //this.close();
                     }.bind(this)}, id
             );
@@ -348,6 +358,9 @@ MWF.xApplication.process.Work.Main = new Class({
                     }
                 }
             }else{
+                layout.sessionPromise.then(function(){
+                    this.close();
+                }.bind(this), function(){});
                 //this.close();
             }
         }.bind(this), function(){