merged

9 years ago · 7f5be16db8
parent 791e069a4c
commit 7f5be16db8
1 changed files with 3 additions and 2 deletions
--- a/app/app.js
+++ b/app/app.js
@ -31,7 +31,7 @@ angular.module('uifordocker', [

    $urlRouterProvider.otherwise('/');

-    $stateProvider
+    $stateProvider
    .state('index', {
      url: '/',
      templateUrl: 'app/components/dashboard/dashboard.html',
@ -92,7 +92,8 @@ angular.module('uifordocker', [
    $httpProvider.interceptors.push(function() {
      return {
        'response': function(response) {
-          if (typeof(response.data) === 'string' && response.data.startsWith('Conflict.')) {
+          if (typeof(response.data) === 'string' &&
+                  (response.data.startsWith('Conflict.') || response.data.startsWith('conflict:'))) {
            $.gritter.add({
              title: 'Error',
              text: $('<div>').text(response.data).html(),