Expose stderr from custom action. fixes publicarray/spksrc#23

publicarray/spksrc#23 (comment)

Author: publicarray

INFO

@@ -10,7 +10,7 @@ distributor="publicarray"
 distributor_url="https://github.com/publicarray/synoedit"
 support_url="https://github.com/publicarray/synoedit/issues/new"
 helpurl="https://github.com/publicarray/synoedit"
-checksum="d3d96c714976f8d1d1d96434cfac9a04"
+checksum="65c662c6325bc599e0853b60faf2624f"
 dsmuidir="ui"
 dsmappname="SYNO.SDS.SynoEdit.Application"
 dsmapppage="SYNO.SDS.SynoEdit.Application"

package/src/synoedit/utils.go

@@ -162,7 +162,7 @@ func ExecuteAction(appName string) string {
 			filePath := GetFilePath(appName, app.Action.OutputFile)
 			SaveFile(filePath, string(stdout))
 		}
-		return string(stdout) + stderr.String()
+		return stderr.String()
 	}
 	logError("App not found in configuration!")
 	return ""

package/ui/js/main.js

@@ -79,12 +79,12 @@ function addParameter(key, value) {
 
 function displayModel(message, status) {
     model.style.display = 'block'
+    modelText.innerText = message
     if (status === 1) {
         model.style.color = '#f00'
     } else {
         model.style.color = '#000'
     }
-    modelText.innerText = message
 }
 function hideModel() {
     model.style.display = 'none'
@@ -229,12 +229,19 @@ actionForm.addEventListener('submit', function(e) {
     var param = addParameter('app', appSelector.value) + addParameter('ajax', 'true')
     debug('params', param)
     ajax('POST', 'action=true' + param, function (responseText) {
+        displaySuccess('Done!')
+        if (responseText.length > 0) {
+            displayModel(responseText, 0)
+        }
+
         // Update editor content if viewing the file currently being modified
         var modifiedFile = configFiles[appSelector.value].Action.OutputFile
         if (modifiedFile !== '' && fileSelector.value == modifiedFile) {
-            updateEditorContent(responseText)
+            var param = addParameter('app', appSelector.value) + addParameter('file', modifiedFile)
+            ajax('GET', param, function(responseText) {
+                updateEditorContent(responseText)
+            })
         }
-        displaySuccess('Done!')
     })
 }, false)