Fixed #493: login intercept should not logout at fail

Author: grtjn

README.mdown

@@ -62,9 +62,7 @@ On Mac or Linux:
     npm install
     bower install
     gulp init-local
-    ./ml local bootstrap
-    ./ml local deploy modules
-    ./ml local deploy content
+    ./ml local install
     ./ml local mlcp -options_file import-sample-data.options
 
 On Windows:
@@ -73,9 +71,7 @@ On Windows:
     npm install
     bower install
     gulp init-local
-    ml.bat local bootstrap
-    ml.bat local deploy modules
-    ml.bat local deploy content
+    ml.bat local install
     ml.bat local mlcp -options_file import-sample-data.options
 
 ## Prepare your Application

app/templates/README.mdown

@@ -32,19 +32,15 @@ On Mac or Linux:
     npm install
     bower install
     gulp init-local
-    ./ml local bootstrap
-    ./ml local deploy modules
-    ./ml local deploy content
+    ./ml local install
     ./ml local mlcp -options_file import-sample-data.options
 
 On Windows:
 
     npm install
     bower install
     gulp init-local
-    ml.bat local bootstrap
-    ml.bat local deploy modules
-    ml.bat local deploy content
+    ml.bat local install
     ml.bat local mlcp -options_file import-sample-data.options
 
 ## Prepare your Application

app/templates/ui/app/error/errorInterceptor.service.js

@@ -14,38 +14,32 @@
       responseError: function(rejection) {
         var msg;
         var toastMsg;
-        if (rejection.status === 500 || rejection.status === 400) {
-          var messageBoardService = $injector.get('messageBoardService');
-          if (rejection.data && rejection.data.errorResponse) {
-            msg = {
-              title: rejection.data.errorResponse.status,
-              body: rejection.data.errorResponse.message
-            };
-          } else {
-            msg = {
-              title: (rejection.status === 400) ? 'Bad Request' : 'Internal Server Error',
-              body: ''
-            };
+        if (rejection.data && rejection.data.errorResponse) {
+          msg = {
+            title: rejection.data.errorResponse.status,
+            body: rejection.data.errorResponse.message
+          };
+        } else {
+          msg = {
+            title: (rejection.status === 401) ? 'Unauthorised' : (
+              (rejection.status >= 400 && rejection.status < 500) ? 'Bad Request' :
+                'Internal Server Error'
+            ),
+            body: ''
+          };
+        }
+        toastMsg = '<strong>' + msg.title + '</strong><p>' + msg.body + '</p>';
+        toast.create({
+          className: 'danger',
+          content: toastMsg,
+          dismissOnTimeout: true,
+          timeout: 2000,
+          onDismiss: function () {
           }
+        });
+        if (rejection.status >= 400 && rejection.status !== 401) {
+          var messageBoardService = $injector.get('messageBoardService');
           messageBoardService.message(msg);
-          toastMsg = '<strong>' + msg.title + '</strong><p>' + msg.body + '</p>';
-          toast.danger(toastMsg);
-        } else if (rejection.status === 401) {
-          if (rejection.data && rejection.data.errorResponse) {
-            msg = {
-              title: rejection.data.errorResponse.status,
-              body: rejection.data.errorResponse.message
-            };
-          } else {
-            msg = {
-              title: (rejection.status === 401) ? 'Unauthorised' : 'Internal Server Error',
-              body: ''
-            };
-          }
-          toastMsg = '<strong>' + msg.title + '</strong><p>' + msg.body + '</p>';
-          var loginService = $injector.get('loginService');
-          loginService.logout();
-          toast.danger(toastMsg);
         }
         return $q.reject(rejection);
       }

app/themes/dashboard/ui/app/dashboard/content-box.js

@@ -8,7 +8,7 @@
     return {
       restrict: 'E',
       transclude: true,
-      replace: false,
+      replace: true,
       scope: {
         boxTitle: '@',
         boxBordered: '@',