Dont fail when cloud.warning is not an array.

Merge branch 'test' into dev
Be able to order by state
project-fifo
Unified Split

Showing with 13 additions and 7 deletions.

+8 −2 app/scripts/controllers/main.js

+1 −1 app/views/machines.html

+1 −1 dist/index.html

+2 −2 dist/scripts/{abb98fd7.main.js → a51987a7.main.js}

+1 −1 dist/views/machines.html
diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
@@ -17,10 +17,10 @@ angular.module('fifoApp')
         if ($scope.user.org)
             $scope.activeOrg = wiggle.orgs.get({id: $scope.user.org})
 
-        wiggle.cloud.get(function res (data) {
+        wiggle.cloud.get(function res(data) {
 
             //Add action link
-            data.warnings.forEach(function(w) {
+            angular.forEach(data.warnings, function(w) {
                 switch (w.category) {
                     case 'chunter':
                         w.link = '#/servers/' + w.element
@@ -44,6 +44,12 @@ angular.module('fifoApp')
             if ($scope.no_servers)
                 $scope.cloud_ok = false
 
+        }, function err(err) {
+
+            // if (err.status === 403)
+            //     return auth.logout();
+
+            console.error('Error while getting cloud status', err)
         })
 
     }

diff --git a/app/views/machines.html b/app/views/machines.html
@@ -50,7 +50,7 @@
       </td>
       <td data-title="'Created' | translate" class='text-muted visible-lg' sortable="'config.created_at'" am-time-ago="vm.config.created_at" title="{{vm.config.created_at | date:'mediumDate'}}"></td>
 
-      <td>
+      <td sortable="'state'" data-title="'State' | translate">
         <span class='label label-{{vm._state_label}} capitalize' jq-run='tooltip' jq-options="{container: 'body'}" title="{{vm.state_description}}">{{vm.state}}</span>
       </td>
 

diff --git a/dist/index.html b/dist/index.html
@@ -18,7 +18,7 @@
     <script src="scripts/5d0b108f.bower_components.js"></script>
 
     <script src="scripts/config.js"></script>
-    <script src="scripts/abb98fd7.main.js"></script>
+    <script src="scripts/a51987a7.main.js"></script>
 
     <script src="scripts/c1af14c1.vendor.js"></script>
 

diff --git a/dist/scripts/abb98fd7.main.js → dist/scripts/a51987a7.main.js b/dist/scripts/abb98fd7.main.js → dist/scripts/a51987a7.main.js
diff --git a/dist/views/machines.html b/dist/views/machines.html
@@ -50,7 +50,7 @@
       </td>
       <td data-title="'Created' | translate" class='text-muted visible-lg' sortable="'config.created_at'" am-time-ago="vm.config.created_at" title="{{vm.config.created_at | date:'mediumDate'}}"></td>
 
-      <td>
+      <td sortable="'state'" data-title="'State' | translate">
         <span class='label label-{{vm._state_label}} capitalize' jq-run='tooltip' jq-options="{container: 'body'}" title="{{vm.state_description}}">{{vm.state}}</span>
       </td>