Merge pull request #1781 from anotherchrisberry/cm-stack-to-detail

rename "cluster" field to "detail" in chaos monkey config
spinnaker · Dec 7, 2015 · 5c066e1 · 5c066e1
2 parents 63e8f70 + 3bf3805
commit 5c066e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/app/scripts/modules/netflix/chaosMonkey/chaosMonkeyConfigFooter.directive.html b/app/scripts/modules/netflix/chaosMonkey/chaosMonkeyConfigFooter.directive.html
@@ -1,7 +1,7 @@
 <div class="row footer">
   <div class="col-md-3">
     <button class="btn btn-default" ng-click="vm.revert()"
-            ng-if="vm.isDirty"
+            ng-if="vm.viewState.isDirty"
             style="visibility: visible;"><span class="glyphicon glyphicon-flash"></span> Revert
     </button>
   </div>

diff --git a/app/scripts/modules/netflix/chaosMonkey/chaosMonkeyExceptions.directive.html b/app/scripts/modules/netflix/chaosMonkey/chaosMonkeyExceptions.directive.html
@@ -5,9 +5,9 @@ <h5>Exceptions <help-field key="chaos.exceptions"></help-field></h5>
       <thead>
       <tr>
         <th>Account</th>
-        <th>Stack</th>
-        <th>Cluster</th>
         <th>Region</th>
+        <th>Stack</th>
+        <th>Detail</th>
         <th></th>
       </tr>
       </thead>
@@ -20,24 +20,24 @@ <h5>Exceptions <help-field key="chaos.exceptions"></help-field></h5>
               provider="'aws'"
               accounts="vm.accounts"></account-select-field>
         </td>
+        <td>
+          <span ng-if="!exception.account">(select account)</span>
+          <select class="form-control input-sm"
+                  ng-model="exception.region"
+                  ng-if="exception.account"
+                  ng-options="region for region in vm.regionsByAccount[exception.account]"
+              ></select>
+        </td>
         <td>
           <input type="text" class="form-control input-sm"
                  ng-model="exception.stack"
                  required/>
         </td>
         <td>
           <input type="text" class="form-control input-sm"
-                 ng-model="exception.cluster"
+                 ng-model="exception.detail"
                  required/>
         </td>
-        <td>
-          <span ng-if="!exception.account">(select account)</span>
-          <select class="form-control input-sm"
-                  ng-model="exception.region"
-                  ng-if="exception.account"
-                  ng-options="region for region in vm.regionsByAccount[exception.account]"
-              ></select>
-        </td>
         <td><a href ng-click="vm.removeException($index)"><span class="glyphicon glyphicon-trash" uib-tooltip="Remove exception"></span></a></td>
       </tr>
       </tbody>