Merge branch 'hotfix/修复设计元素在窗口模式新建报错的问题' into 'master'

Merge of hotfix/修复设计元素在窗口模式新建报错的问题 to master

See merge request o2oa/o2oa!1259

(cherry picked from commit b1e5cd0a)

4b8445b5 修复设计元素在窗口模式新建报错的问题

o2web/source/x_component_cms_ColumnManager/DictionaryExplorer.js

@@ -12,6 +12,10 @@ MWF.xApplication.cms.ColumnManager.DictionaryExplorer = new Class({
     _createElement: function(e){
         var _self = this;
         var options = {
+            "application":{
+                "name": _self.app.options.column.name,
+                "id": _self.app.options.column.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.app.restActions;
                 this.application = _self.app.options.column;
@@ -338,7 +342,11 @@ MWF.xApplication.cms.ColumnManager.DictionaryExplorer.Dictionary = new Class({
 		var options = {
             "appId": "cms.DictionaryDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application": _self.explorer.app.options.column.id,
+            // "application": _self.explorer.app.options.column.id,
+            "application":{
+                "name": _self.explorer.app.options.column.name,
+                "id": _self.explorer.app.options.column.id
+            },
 			"onQueryLoad": function(){
 				this.actions = _self.explorer.actions;
 				this.category = _self;

o2web/source/x_component_cms_ColumnManager/FormExplorer.js

@@ -97,6 +97,10 @@ MWF.xApplication.cms.ColumnManager.FormExplorer = new Class({
                     var options = {
                         "style": layout.desktop.formDesignerStyle,
                         "template": template,
+                        "application":{
+                            "name": _self.app.options.application.name,
+                            "id": _self.app.options.application.id
+                        },
                         "onQueryLoad": function () {
                             this.actions = _self.app.restActions;
                             this.application = _self.app.options.application;
@@ -113,6 +117,10 @@ MWF.xApplication.cms.ColumnManager.FormExplorer = new Class({
                     var options = {
                         "style": layout.desktop.formDesignerStyle,
                         "templateId": template,
+                        "application":{
+                            "name": _self.app.options.application.name,
+                            "id": _self.app.options.application.id
+                        },
                         "onQueryLoad": function () {
                             this.actions = _self.app.restActions;
                             this.application = _self.app.options.application;
@@ -374,7 +382,11 @@ MWF.xApplication.cms.ColumnManager.FormExplorer.Form = new Class({
                 "style": layout.desktop.formDesignerStyle,
                 "appId": "cms.FormDesigner"+_self.data.id,
                 "id": _self.data.id,
-                "application": _self.explorer.app.options.column.id,
+                // "application": _self.explorer.app.options.column.id,
+                "application":{
+                    "name": _self.explorer.app.options.column.name,
+                    "id": _self.explorer.app.options.column.id
+                },
                 "onQueryLoad": function(){
                     this.actions = _self.explorer.actions;
                     this.category = _self;

o2web/source/x_component_cms_ColumnManager/ScriptExplorer.js

@@ -13,11 +13,16 @@ MWF.xApplication.cms.ColumnManager.ScriptExplorer = new Class({
 
     _createElement: function(e){
         var _self = this;
+        var application = _self.app.options.application || _self.app.application || _self.app.options.column || _self.app.column;
         var options = {
+            "application":{
+                "name": application.name,
+                "id": application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.app.restActions;
                 //_self.app.options.application = _self.app.options.application || _self.app.options.column;
-                this.application = _self.app.options.application || _self.app.application || _self.app.options.column || _self.app.column;
+                this.application = application;
                 this.column = this.application;
                 this.explorer = _self;
             },
@@ -223,16 +228,21 @@ MWF.xApplication.cms.ColumnManager.ScriptExplorer.Script = new Class({
     },
 	_open: function(e){
 		var _self = this;
+		var application = _self.explorer.app.options.application || _self.explorer.app.options.column;
 		var options = {
             "appId": "cms.ScriptDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application": (_self.explorer.app.options.application || _self.explorer.app.options.column).id,
+            // "application": (_self.explorer.app.options.application || _self.explorer.app.options.column).id,
+            "application":{
+                "name": application.name,
+                "id": application.id
+            },
 			"onQueryLoad": function(){
 				this.actions = _self.explorer.actions;
 				this.category = _self;
 				this.options.id = _self.data.id;
-                this.application = _self.explorer.app.options.application || _self.explorer.app.options.column;
-                this.column = _self.explorer.app.options.application || _self.explorer.app.options.column;
+                this.application = application;
+                this.column = application;
                 this.explorer = _self.explorer
 			}
 		};

o2web/source/x_component_cms_DictionaryDesigner/Main.js

@@ -30,6 +30,11 @@ MWF.xApplication.cms.DictionaryDesigner.Main = new Class({
             this.setOptions(this.status.options);
         }
 
+        if( this.options.application ){
+            if( !this.application  )this.application = this.options.application;
+            if( !this.column  )this.column = this.options.application;
+        }
+
 		if (!this.options.id){
 			this.options.desktopReload = false;
 			this.options.title = this.options.title + "-"+MWF.CMSDD.LP.newDictionary;

o2web/source/x_component_cms_FormDesigner/Main.js

@@ -38,6 +38,12 @@ MWF.xApplication.cms.FormDesigner.Main = new Class({
 		this.actions = MWF.Actions.get("x_cms_assemble_control"); //new MWF.xApplication.cms.ColumnManager.Actions.RestActions();
 		
 		this.lp = MWF.xApplication.cms.FormDesigner.LP;
+
+		if( this.options.application ){
+            if( !this.application  )this.application = this.options.application;
+            if( !this.column  )this.column = this.options.application;
+        }
+
 //		this.processData = this.options.processData;
 	},
 

o2web/source/x_component_cms_ScriptDesigner/Main.js

@@ -26,6 +26,12 @@ MWF.xApplication.cms.ScriptDesigner.Main = new Class({
             this.application = this.status.application;
 			this.options.id = this.status.id;
         }
+
+        if( this.options.application ){
+            if( !this.application  )this.application = this.options.application;
+            if( !this.column  )this.column = this.options.application;
+        }
+
 		if (!this.options.id){
 			this.options.desktopReload = false;
 			this.options.title = this.options.title + "-"+MWF.CMSSD.LP.newScript;

o2web/source/x_component_portal_PageDesigner/Main.js

@@ -33,6 +33,9 @@ MWF.xApplication.portal.PageDesigner.Main = new Class({
 			this.options.desktopReload = false;
 			this.options.title = this.options.title + "-"+MWF.APPPOD.LP.newPage;
 		}
+        if( this.options.application ){
+            if( !this.application  )this.application = this.options.application;
+        }
         this.actions = MWF.Actions.get("x_portal_assemble_designer");
 		//this.actions = new MWF.xApplication.portal.PortalManager.Actions.RestActions();
 		

o2web/source/x_component_portal_PortalManager/PageExplorer.js

@@ -189,18 +189,29 @@ MWF.xApplication.portal.PortalManager.PageExplorer = new Class({
     },
 
     _createElement: function(e){
-        layout.desktop.getPageDesignerStyle(function(){
-            var _self = this;
-            var options = {
-                "style": layout.desktop.pageDesignerStyle,
-                "template": "page.json",
-                "onQueryLoad": function(){
-                    this.actions = _self.app.restActions;
-                    this.application = _self.app.options.application;
-                }
-            };
-            layout.desktop.openApplication(e, "portal.PageDesigner", options);
-        }.bind(this));
+	    if( layout.desktop && layout.desktop.getPageDesignerStyle ){
+            layout.desktop.getPageDesignerStyle(function(){
+                this.__createElement(e, layout.desktop.pageDesignerStyle )
+            }.bind(this));
+        }else{
+            this.__createElement( e,"default" );
+        }
+    },
+    __createElement: function( e, style ){
+        var _self = this;
+        var options = {
+            "style": style,
+            "template": "page.json",
+            "application":{
+                "name": _self.app.options.application.name,
+                "id": _self.app.options.application.id
+            },
+            "onQueryLoad": function(){
+                this.actions = _self.app.restActions;
+                this.application = _self.app.options.application;
+            }
+        };
+        layout.desktop.openApplication(e, "portal.PageDesigner", options);
     },
 
     _loadItemDataList: function(callback){
@@ -233,7 +244,11 @@ MWF.xApplication.portal.PortalManager.PageExplorer.Page= new Class({
         var options = {
             "appId": "portal.PageDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application": _self.explorer.app.options.application.id,
+            // "application": _self.explorer.app.options.application.id,
+            "application":{
+                "name": _self.explorer.app.options.application.name,
+                "id": _self.explorer.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.explorer.actions;
                 this.category = _self;

o2web/source/x_component_portal_PortalManager/ScriptExplorer.js

@@ -167,10 +167,15 @@ MWF.xApplication.portal.PortalManager.ScriptExplorer = new Class({
 
     _createElement: function(e){
         var _self = this;
+        var application = _self.app.options.application || _self.app.application;
         var options = {
+            "application":{
+                "name": application.name,
+                "id": application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.app.restActions;
-                this.application = _self.app.options.application || _self.app.application;
+                this.application = application;
                 this.explorer = _self;
             }
         };
@@ -223,7 +228,11 @@ MWF.xApplication.portal.PortalManager.ScriptExplorer.Script = new Class({
 		var options = {
             "appId": "portal.ScriptDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application": _self.explorer.app.options.application.id,
+            // "application": _self.explorer.app.options.application.id,
+            "application":{
+                "name": _self.explorer.app.options.application.name,
+                "id": _self.explorer.app.options.application.id
+            },
 			"onQueryLoad": function(){
 				this.actions = _self.explorer.actions;
 				this.category = _self;

o2web/source/x_component_portal_PortalManager/WidgetExplorer.js

@@ -194,6 +194,10 @@ MWF.xApplication.portal.PortalManager.WidgetExplorer = new Class({
         var options = {
             "style": layout.desktop.pageDesignerStyle || "default",
             //"templateId": "page.json",
+            "application":{
+                "name": _self.app.options.application.name,
+                "id": _self.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.app.restActions;
                 this.application = _self.app.options.application;
@@ -231,7 +235,11 @@ MWF.xApplication.portal.PortalManager.WidgetExplorer.Widget= new Class({
         var options = {
             "appId": "portal.WidgetDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application": _self.explorer.app.options.application.id,
+            // "application": _self.explorer.app.options.application.id,
+            "application":{
+                "name": _self.explorer.app.options.application.name,
+                "id": _self.explorer.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.explorer.actions;
                 this.category = _self;

o2web/source/x_component_portal_ScriptDesigner/Main.js

@@ -30,6 +30,10 @@ MWF.xApplication.portal.ScriptDesigner.Main = new Class({
 			this.options.title = this.options.title + "-"+MWF.xApplication.portal.ScriptDesigner.LP.newScript;
 		}
 
+        if( this.options.application ){
+            if( !this.application  )this.application = this.options.application;
+        }
+
         this.actions = MWF.Actions.get("x_portal_assemble_designer");
 		//this.actions = new MWF.xApplication.portal.PortalManager.Actions.RestActions();
 		

o2web/source/x_component_process_DictionaryDesigner/Main.js

@@ -29,7 +29,9 @@ MWF.xApplication.process.DictionaryDesigner.Main = new Class({
             this.options.id = this.status.id;
             this.setOptions(this.status.options);
         }
-
+        if( !this.application && this.options.application ){
+            this.application = this.options.application;
+        }
 		if (!this.options.id){
 			this.options.desktopReload = false;
 			this.options.title = this.options.title + "-"+MWF.APPDD.LP.newDictionary;

o2web/source/x_component_process_FormDesigner/Main.js

@@ -34,6 +34,9 @@ MWF.xApplication.process.FormDesigner.Main = new Class({
 		}
         this.actions = MWF.Actions.get("x_processplatform_assemble_designer");
 		this.lp = MWF.xApplication.process.FormDesigner.LP;
+		if( !this.application && this.options.application ){
+		    this.application = this.options.application;
+        }
 	},
 	
 	loadApplication: function(callback){

o2web/source/x_component_process_ProcessDesigner/Main.js

@@ -37,7 +37,10 @@ MWF.xApplication.process.ProcessDesigner.Main = new Class({
         //this.actions = new MWF.xApplication.process.ProcessManager.Actions.RestActions();
 
         this.lp = MWF.xApplication.process.ProcessDesigner.LP;
-//		this.processData = this.options.processData;		
+//		this.processData = this.options.processData;
+        if( !this.application && this.options.application ){
+            this.application = this.options.application;
+        }
     },
     loadApplication: function(callback){
         this.gadgets = [];

o2web/source/x_component_process_ProcessManager/DictionaryExplorer.js

@@ -211,6 +211,10 @@ MWF.xApplication.process.ProcessManager.DictionaryExplorer = new Class({
     _createElement: function(e){
         var _self = this;
         var options = {
+            "application":{
+                "name": _self.app.options.application.name,
+                "id": _self.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.app.restActions;
                 this.application = _self.app.options.application;
@@ -377,7 +381,11 @@ MWF.xApplication.process.ProcessManager.DictionaryExplorer.Dictionary = new Clas
 		var options = {
             "appId": "process.DictionaryDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application": _self.explorer.app.options.application.id,
+            // "application": _self.explorer.app.options.application.id,
+            "application":{
+                "name": _self.explorer.app.options.application.name,
+                "id": _self.explorer.app.options.application.id
+            },
             "noModifyName": _self.explorer.options.noModifyName,
             "readMode": _self.explorer.options.readMode,
 			"onQueryLoad": function(){

o2web/source/x_component_process_ProcessManager/FormExplorer.js

@@ -195,6 +195,10 @@ MWF.xApplication.process.ProcessManager.FormExplorer = new Class({
                 var options = {
                     "style": layout.desktop.formDesignerStyle,
                     "template": template,
+                     "application":{
+                        "name": _self.app.options.application.name,
+                         "id": _self.app.options.application.id
+                     },
                     "onQueryLoad": function(){
                         this.actions = _self.app.restActions;
                         this.application = _self.app.options.application;
@@ -208,6 +212,10 @@ MWF.xApplication.process.ProcessManager.FormExplorer = new Class({
                 var options = {
                     "style": layout.desktop.formDesignerStyle,
                     "templateId": template,
+                    "application":{
+                        "name": _self.app.options.application.name,
+                        "id": _self.app.options.application.id
+                    },
                     "onQueryLoad": function(){
                         this.actions = _self.app.restActions;
                         this.application = _self.app.options.application;
@@ -432,7 +440,11 @@ MWF.xApplication.process.ProcessManager.FormExplorer.Form = new Class({
                 "style": layout.desktop.formDesignerStyle,
                 "appId": "process.FormDesigner"+_self.data.id,
                 "id": _self.data.id,
-                "application": _self.explorer.app.options.application.id,
+                // "application": _self.explorer.app.options.application.id,
+                "application":{
+                    "name": _self.explorer.app.options.application.name,
+                    "id": _self.explorer.app.options.application.id
+                },
                 "onQueryLoad": function(){
                     this.actions = _self.explorer.actions;
                     this.category = _self;

o2web/source/x_component_process_ProcessManager/ProcessExplorer.js

@@ -220,6 +220,10 @@ MWF.xApplication.process.ProcessManager.ProcessExplorer = new Class({
         var createProcess = function(e, template){
             var options = {
                 "template": template,
+                "application":{
+                    "name": _self.app.options.application.name,
+                    "id": _self.app.options.application.id
+                },
                 "onQueryLoad": function(){
                     this.actions = _self.app.restActions;
                     this.application = _self.app.options.application;
@@ -335,7 +339,11 @@ MWF.xApplication.process.ProcessManager.ProcessExplorer.Process = new Class({
         var options = {
             "appId": "process.ProcessDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application": _self.explorer.app.options.application.id,
+            // "application": _self.explorer.app.options.application.id,
+            "application":{
+                "name": _self.explorer.app.options.application.name,
+                "id": _self.explorer.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.explorer.actions;
                 this.category = _self;

o2web/source/x_component_process_ProcessManager/ScriptExplorer.js

@@ -157,6 +157,10 @@ MWF.xApplication.process.ProcessManager.ScriptExplorer = new Class({
     _createElement: function(e){
         var _self = this;
         var options = {
+            "application":{
+                "name": (_self.app.options.application || _self.app.application).name,
+                "id": (_self.app.options.application || _self.app.application).id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.app.restActions;
                 this.application = _self.app.options.application || _self.app.application;
@@ -214,7 +218,11 @@ MWF.xApplication.process.ProcessManager.ScriptExplorer.Script = new Class({
 		var options = {
             "appId": "process.ScriptDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application": _self.explorer.app.options.application.id,
+            // "application": _self.explorer.app.options.application.id,
+            "application":{
+                "name": _self.explorer.app.options.application.name,
+                "id": _self.explorer.app.options.application.id
+            },
 			"onQueryLoad": function(){
 				this.actions = _self.explorer.actions;
 				this.category = _self;

o2web/source/x_component_process_ScriptDesigner/Main.js

@@ -30,6 +30,9 @@ MWF.xApplication.process.ScriptDesigner.Main = new Class({
 			this.options.desktopReload = false;
 			this.options.title = this.options.title + "-"+MWF.APPSD.LP.newScript;
 		}
+        if( !this.application && this.options.application ){
+            this.application = this.options.application;
+        }
 
         this.actions = MWF.Actions.get("x_processplatform_assemble_designer");
 		//this.actions = new MWF.xApplication.process.ProcessManager.Actions.RestActions();

o2web/source/x_component_query_ImporterDesigner/Main.js

@@ -30,7 +30,9 @@ MWF.xApplication.query.ImporterDesigner.Main = new Class({
             this.application = this.status.application;
             this.options.id = this.status.id;
         }
-
+        if( !this.application && this.options.application ){
+            this.application = this.options.application;
+        }
         if (!this.options.id){
             this.options.desktopReload = false;
             this.options.title = this.options.title + "-"+MWF.APPDIPD.LP.newImporter;
@@ -94,7 +96,11 @@ MWF.xApplication.query.ImporterDesigner.Main = new Class({
                 var options = {
                     "appId": "query.ImporterDesigner"+importer.id,
                     "id": importer.id,
-                    "application": _self.application.id,
+                    // "application": _self.application.id,
+                    "application": {
+                        "name": _self.application.name,
+                        "id": _self.application.id,
+                    },
                     "onQueryLoad": function(){
                         this.actions = _self.actions;
                         this.category = _self;

o2web/source/x_component_query_QueryManager/ImporterExplorer.js

@@ -192,6 +192,11 @@ MWF.xApplication.query.QueryManager.ImporterExplorer = new Class({
     _createElement: function(e){
         var _self = this;
         var options = {
+            "application":{
+                "name": _self.app.options.application.name,
+                "id": _self.app.options.application.id
+            },
+            // "application":_self.app.options.application.id,
             "onQueryLoad": function(){
                 this.actions = _self.app.restActions;
                 this.application = _self.app.options.application;
@@ -236,7 +241,11 @@ MWF.xApplication.query.QueryManager.ImporterExplorer.Importer= new Class({
         var options = {
             "appId": "query.ImporterDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application":_self.explorer.app.options.application.id,
+            //"application":_self.explorer.app.options.application.id,
+            "application":{
+                "name": _self.explorer.app.options.application.name,
+                "id": _self.explorer.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.explorer.actions;
                 this.category = _self;

o2web/source/x_component_query_QueryManager/StatExplorer.js

@@ -176,6 +176,10 @@ MWF.xApplication.query.QueryManager.StatExplorer = new Class({
     _createElement: function(e){
         var _self = this;
         var options = {
+            "application":{
+                "name": _self.app.options.application.name,
+                "id": _self.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.app.restActions;
                 this.application = _self.app.options.application;
@@ -220,7 +224,11 @@ MWF.xApplication.query.QueryManager.StatExplorer.Stat= new Class({
         var options = {
             "appId": "query.StatDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application":_self.explorer.app.options.application.id,
+            // "application":_self.explorer.app.options.application.id,
+            "application":{
+                "name": _self.explorer.app.options.application.name,
+                "id": _self.explorer.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.explorer.actions;
                 this.category = _self;

o2web/source/x_component_query_QueryManager/StatementExplorer.js

@@ -184,6 +184,10 @@ MWF.xApplication.query.QueryManager.StatementExplorer = new Class({
     _createElement: function(e){
         var _self = this;
         var options = {
+            "application":{
+                "name": _self.app.options.application.name,
+                "id": _self.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.app.restActions;
                 this.application = _self.app.options.application;
@@ -248,7 +252,11 @@ MWF.xApplication.query.QueryManager.StatementExplorer.Statement= new Class({
         var options = {
             "appId": "query.StatementDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application":_self.explorer.app.options.application.id,
+            // "application":_self.explorer.app.options.application.id,
+            "application":{
+                "name": _self.explorer.app.options.application.name,
+                "id": _self.explorer.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.explorer.actions;
                 this.category = _self;

o2web/source/x_component_query_QueryManager/TableExplorer.js

@@ -202,6 +202,10 @@ MWF.xApplication.query.QueryManager.TableExplorer = new Class({
     _createElement: function(e){
         var _self = this;
         var options = {
+            "application":{
+                "name": _self.app.options.application.name,
+                "id": _self.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.app.restActions;
                 this.application = _self.app.options.application;
@@ -261,7 +265,11 @@ MWF.xApplication.query.QueryManager.TableExplorer.Table= new Class({
         var options = {
             "appId": "query.TableDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application":_self.explorer.app.options.application.id,
+            // "application":_self.explorer.app.options.application.id,
+            "application":{
+                "name": _self.explorer.app.options.application.name,
+                "id": _self.explorer.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.explorer.actions;
                 this.category = _self;

o2web/source/x_component_query_QueryManager/ViewExplorer.js

@@ -178,6 +178,10 @@ MWF.xApplication.query.QueryManager.ViewExplorer = new Class({
     _createElement: function(e){
         var _self = this;
         var options = {
+            "application":{
+                "name": _self.app.options.application.name,
+                "id": _self.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.app.restActions;
                 this.application = _self.app.options.application;
@@ -221,7 +225,11 @@ MWF.xApplication.query.QueryManager.ViewExplorer.View= new Class({
         var options = {
             "appId": "query.ViewDesigner"+_self.data.id,
             "id": _self.data.id,
-            "application":_self.explorer.app.options.application.id,
+            // "application":_self.explorer.app.options.application.id,
+            "application":{
+                "name": _self.explorer.app.options.application.name,
+                "id": _self.explorer.app.options.application.id
+            },
             "onQueryLoad": function(){
                 this.actions = _self.explorer.actions;
                 this.category = _self;

o2web/source/x_component_query_StatDesigner/Main.js

@@ -31,7 +31,9 @@ MWF.xApplication.query.StatDesigner.Main = new Class({
             this.application = this.status.application;
             this.options.id = this.status.id;
         }
-
+        if( !this.application && this.options.application ){
+            this.application = this.options.application;
+        }
         if (!this.options.id){
             this.options.desktopReload = false;
             this.options.title = this.options.title + "-"+MWF.APPDSTD.LP.newStat;
@@ -102,7 +104,11 @@ MWF.xApplication.query.StatDesigner.Main = new Class({
                 var options = {
                     "appId": "query.StatDesigner"+view.id,
                     "id": view.id,
-                    "application": _self.application.id,
+                    // "application": _self.application.id,
+                    "application": {
+                        "name": _self.application.name,
+                        "id": _self.application.id,
+                    },
                     "onQueryLoad": function(){
                         this.actions = _self.actions;
                         this.category = _self;

o2web/source/x_component_query_StatementDesigner/Main.js

@@ -30,7 +30,9 @@ MWF.xApplication.query.StatementDesigner.Main = new Class({
             this.application = this.status.application;
             this.options.id = this.status.id;
         }
-
+        if( !this.application && this.options.application ){
+            this.application = this.options.application;
+        }
         if (!this.options.id){
             this.options.desktopReload = false;
             this.options.title = this.options.title + "-"+MWF.APPDSMD.LP.newStatement;
@@ -217,7 +219,11 @@ MWF.xApplication.query.StatementDesigner.Main = new Class({
             var options = {
                 "appId": "query.StatementDesigner"+statement.id,
                 "id" : statement.id,
-                "application": _self.application.id,
+                // "application": _self.application.id,
+                "application": {
+                    "name": _self.application.name,
+                    "id": _self.application.id,
+                },
                 "onQueryLoad": function(){
                     this.actions = _self.actions;
                     this.category = _self;

o2web/source/x_component_query_TableDesigner/Main.js

@@ -31,7 +31,9 @@ MWF.xApplication.query.TableDesigner.Main = new Class({
             this.application = this.status.application;
             this.options.id = this.status.id;
         }
-
+        if( !this.application && this.options.application ){
+            this.application = this.options.application;
+        }
         if (!this.options.id){
             this.options.desktopReload = false;
             this.options.title = this.options.title + "-"+MWF.APPDTBD.LP.newTable;
@@ -94,7 +96,11 @@ MWF.xApplication.query.TableDesigner.Main = new Class({
                 var options = {
                     "appId": "query.TableDesigner"+table.id,
                     "id": table.id,
-                    "application": _self.application.id,
+                    // "application": _self.application.id,
+                    "application": {
+                        "name": _self.application.name,
+                        "id": _self.application.id,
+                    },
                     "onQueryLoad": function(){
                         this.actions = _self.actions;
                         this.category = _self;

o2web/source/x_component_query_ViewDesigner/Main.js

@@ -29,7 +29,9 @@ MWF.xApplication.query.ViewDesigner.Main = new Class({
             this.application = this.status.application;
             this.options.id = this.status.id;
         }
-
+        if( !this.application && this.options.application ){
+            this.application = this.options.application;
+        }
 		if (!this.options.id){
 			this.options.desktopReload = false;
 			this.options.title = this.options.title + "-"+MWF.APPDVD.LP.newView;
@@ -183,7 +185,8 @@ MWF.xApplication.query.ViewDesigner.Main = new Class({
 	},
     getApplication:function(callback){
         if (!this.application){
-            this.actions.getApplication((this.options.application), function(json){
+            var app = typeOf(this.options.application) === "string" ? this.options.application : this.options.application.id;
+            this.actions.getApplication((app), function(json){
                 this.application = {"name": json.data.name, "id": json.data.id};
                 if (callback) callback();
             }.bind(this));
@@ -360,7 +363,11 @@ MWF.xApplication.query.ViewDesigner.Main = new Class({
                 var options = {
                     "appId": "query.ViewDesigner"+view.id,
                     "id": view.id,
-                    "application": _self.application.id,
+                    // "application": _self.application.id,
+                    "application": {
+                        "name": _self.application.name,
+                        "id": _self.application.id,
+                    },
                     "onQueryLoad": function(){
                         this.actions = _self.actions;
                         this.category = _self;