resolve conflicts

2021-09-06 12:36:24 +12:00
parent 6fe6f36696 4ffee27a4b
commit 0ee42f76c3
84 changed files with 1475 additions and 205 deletions
@@ -38,6 +38,17 @@ angular.module('portainer.docker').controller('KubernetesResourcePoolsDatatableC
      return !ctrl.isSystemNamespace(item) || (ctrl.settings.showSystem && ctrl.isAdmin);
    };

+    this.namespaceStatusColor = function (status) {
+      switch (status.toLowerCase()) {
+        case 'active':
+          return 'success';
+        case 'terminating':
+          return 'danger';
+        default:
+          return 'primary';
+      }
+    };
+
    /**
     * Do not allow system namespaces to be selected
     */