Auto-open logger (with associated preference), add re-open button in logger toolbar...

[gpl/argeo-slc.git] / server / org.argeo.slc.ria / src / argeo-ria-lib / slc / class / org / argeo / slc / ria / BatchView.js

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/BatchView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/BatchView.js
index d3dc3f8cba4a6cad0534cbe16a567f7511be6702..30a5e76c705bd52d8916f73a4419fe8cdbe1df8f 100644 (file)
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/BatchView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/BatchView.js
@@ -17,6 +17,11 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                                label : "Autoclear batch on execution",\r
                                type : "boolean",\r
                                defaultValue : false\r
+                       },\r
+                       "slc.batch.autoOpenLog" : {\r
+                               label : "Auto open log on execution",\r
+                               type  : "boolean",\r
+                               defaultValue  : true                            \r
                        }\r
                }\r
        },\r
@@ -372,27 +377,23 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                        var host = agentsMap[agentUuid];\r
                        var slcExecMessage = new org.argeo.slc.ria.execution.Message();\r
                        slcExecMessage.setHost(host);\r
+                       var execUuid = slcExecMessage.getUuid();\r
                        for (var i = 0; i < selection.length; i++) {\r
                                var batchEntrySpec = selection[i].getUserData("batchEntrySpec");\r
                                slcExecMessage.addBatchEntrySpec(batchEntrySpec);\r
                        }\r
                        try{\r
                                var xmlMessage = slcExecMessage.toXml();\r
-                               if(!window.xmlExecStub){\r
-                                       window.xmlExecStub = {};\r
-                               }\r
-                               window.xmlExecStub[slcExecMessage.getUuid()] = qx.xml.Document.fromString(xmlMessage);\r
                                var req = org.argeo.slc.ria.SlcApi.getNewSlcExecutionService(\r
                                                agentUuid, xmlMessage);\r
+                               req.addListener("completed", function(response){\r
+                                       var loggerView = org.argeo.ria.components.ViewsManager.getInstance().getViewPaneById("main").getContent();\r
+                                       loggerView.reloadLogger();\r
+                                       if(this.getRiaPreferenceValue("slc.batch.autoOpenLog")){\r
+                                               loggerView.openDetail([0,host,execUuid,0]);\r
+                                       }\r
+                               }, this);\r
                                req.send();\r
-                               // Force logs refresh right now!\r
-                               qx.event.Timer.once(function() {\r
-                                                       var command = org.argeo.ria.event.CommandsManager\r
-                                                                       .getInstance().getCommandById("reloadlogs");\r
-                                                       if (command) {\r
-                                                               command.execute();\r
-                                                       }\r
-                                               }, this, 2000);\r
                                if(clearBatch){\r
                                        req.addListener("completed", function(e){\r
                                                this.list.removeAll();\r