Auto-Organize: Display errors in client on server exceptions (#2)

When an exception occured on the server, the organize dialog or the confirm dialog were displayed eternally and not indication of failure was presented to the user Auto-Organize: Display errors in client on server exceptions When an exception occured on the server, the organize dialog or the confirm dialog were displayed eternally and not indication of failure was presented to the user
softworkz · Sep 28, 2015 · 41cc04c · 41cc04c
1 parent abefb9b
commit 41cc04c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/MediaBrowser.WebDashboard/dashboard-ui/scripts/autoorganizelog.js b/MediaBrowser.WebDashboard/dashboard-ui/scripts/autoorganizelog.js
@@ -137,8 +137,8 @@
 
                     Dashboard.alert({
 
-                        title: 'Status: ' + e.status + ' ' + e.statusText,
-                        message: e.getResponseHeader("X-Application-Error-Code")
+                        title: Globalize.translate('AutoOrganizeError'),
+                        message: e.status + ' - ' + e.statusText + '<br>' + e.getResponseHeader("X-Application-Error-Code")
 
                     });
                 });
@@ -182,8 +182,8 @@
 
             Dashboard.alert({
 
-                title: 'Status: ' + e.status + ' ' + e.statusText,
-                message: e.getResponseHeader("X-Application-Error-Code")
+                title: Globalize.translate('AutoOrganizeError'),
+                message: e.status + ' - ' + e.statusText + '<br>' + e.getResponseHeader("X-Application-Error-Code")
 
             });
         });

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/en-US.json b/MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/en-US.json
@@ -252,6 +252,7 @@
     "HeaderSelectWatchFolder": "Select Watch Folder",
     "HeaderSelectWatchFolderHelp": "Browse or enter the path to your watch folder. The folder must be writeable.",
     "OrganizePatternResult": "Result: {0}",
+    "AutoOrganizeError": "Error Organizing File",
     "HeaderRestart": "Restart",
     "HeaderShutdown": "Shutdown",
     "MessageConfirmRestart": "Are you sure you wish to restart Emby Server?",

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/javascript.json b/MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/javascript.json
@@ -253,6 +253,7 @@
     "HeaderSelectWatchFolder": "Select Watch Folder",
     "HeaderSelectWatchFolderHelp": "Browse or enter the path to your watch folder. The folder must be writeable.",
     "OrganizePatternResult": "Result: {0}",
+    "AutoOrganizeError": "Error Organizing File",
     "HeaderRestart": "Restart",
     "HeaderShutdown": "Shutdown",
     "MessageConfirmRestart": "Are you sure you wish to restart Emby Server?",