}\r
var prefName = "slc.batch.autoclear";\r
var prefValue = this.getRiaPreferenceValue(prefName);\r
- if(prefValue !== null && prefValue === true){\r
+ if(( prefValue !== null && prefValue === true ) || this.getForceClearPreference()){\r
this.executeBatchOnAgent(batchAgentId, true); \r
}else{\r
this.executeBatchOnAgent(batchAgentId, false);\r
}\r
+ this.setForceClearPreference(false);\r
return;\r
- var modal = new org.argeo.ria.components.Modal("Clear?", null);\r
- modal.addYesNoReminder("Do you want to clear the batch automatically after execution?", prefName);\r
- modal.addListener("cancel", function(e){\r
- this.executeBatchOnAgent(batchAgentId, false);\r
- }, this);\r
- modal.addListener("ok", function(e){\r
- this.executeBatchOnAgent(batchAgentId, true);\r
- }, this);\r
- modal.attachAndShow(); \r
- },\r
- command : null\r
- },\r
- /*\r
- "toggleopenonadd" : {\r
- label : "Auto edit on Add",\r
- icon : "org.argeo.slc.ria/document-open.png",\r
- shortcut : null,\r
- enabled : true,\r
- toggle : true,\r
- toggleInitialState : true,\r
- menu : "Launcher",\r
- toolbar : "launcher",\r
- callback : function(event) {\r
- var state = event.getTarget().getUserData("slc.command.toggleState");\r
- this.setAutoOpen(state);\r
},\r
command : null\r
},\r
- "editexecutionspecs" : {\r
- label : "Edit Execution Specs",\r
- icon : "org.argeo.slc.ria/document-open.png",\r
- shortcut : null,\r
- enabled : false,\r
- menu : "Launcher",\r
- toolbar : "batch",\r
- callback : function(e) {\r
- var sel = this.list.getSortedSelection();\r
- var spec = sel[0].getUserData("batchEntrySpec");\r
- if (spec.hasEditableValues()) {\r
- var specEditor = new org.argeo.slc.ria.execution.SpecEditor(spec);\r
- specEditor.attachAndShow();\r
- }\r
- },\r
- selectionChange : function(viewId, selection) {\r
- if (viewId != "batch:list")\r
- return;\r
- this.setEnabled(false);\r
- if ((selection && selection.length == 1)) {\r
- var selectedItemSpec = selection[0].getUserData("batchEntrySpec");\r
- if (selectedItemSpec.hasEditableValues()) {\r
- this.setEnabled(true);\r
- }\r
- }\r
- },\r
- command : null\r
- },\r
- */\r
"removefrombatch" : {\r
label : "Remove from batch",\r
icon : "org.argeo.slc.ria/edit-delete.png",\r
nullable : true,\r
check : "String",\r
event : "changeBatchAgentId"\r
- } \r
+ },\r
+ forceClearPreference : {\r
+ init : false,\r
+ check : "Boolean"\r
+ }\r
},\r
\r
construct : function(){\r
instanceLabel : {\r
init : ""\r
},\r
+ executeAfterAdd : {\r
+ init : false,\r
+ check : "Boolean"\r
+ },\r
/**\r
* Commands definition, see\r
* {@link org.argeo.ria.event.CommandsManager#definitions}\r
return;\r
}\r
}\r
+ if(this.getExecuteAfterAdd() && batchView.getCommands()){\r
+ batchView.setForceClearPreference(true);\r
+ batchView.getCommands()["submitform"].command.execute();\r
+ }\r
+ this.setExecuteAfterAdd(false);\r
},\r
selectionChange : function(viewId, selection) {\r
if (viewId != "form:tree")\r
}\r
}, this);\r
\r
+ this.tree.addListener("dblclick", function(e){\r
+ var sel = this.tree.getSortedSelection();\r
+ if(sel && sel.length!=1) return;\r
+ var origin = sel[0];\r
+ if(origin.classname == "qx.ui.tree.TreeFile"){\r
+ this.setExecuteAfterAdd(true);\r
+ this.getCommands()["addtobatch"].command.execute();\r
+ }\r
+ }, this);\r
\r
this.add(this.tree);\r
},\r