support include_aliases option while restoring snapshots

closes #302
lmenezes · Oct 19, 2015 · 03b721c · 03b721c
1 parent f6b2531
commit 03b721c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/_site/dist/kopf.js b/_site/dist/kopf.js
@@ -2008,10 +2008,8 @@ kopf.controller('SnapshotController', ['$scope', 'ConfirmDialogService',
         body.indices = $scope.restore_snap.indices.join(',');
       }
 
-      if (angular.isDefined($scope.restore_snap.include_global_state)) {
-        body.include_global_state = $scope.restore_snap.include_global_state;
-      }
-
+      $scope.optionalParam(body, $scope.restore_snap, 'include_global_state');
+      $scope.optionalParam(body, $scope.restore_snap, 'include_aliases');
       $scope.optionalParam(body, $scope.restore_snap, 'ignore_unavailable');
       $scope.optionalParam(body, $scope.restore_snap, 'rename_replacement');
       $scope.optionalParam(body, $scope.restore_snap, 'rename_pattern');

diff --git a/_site/partials/snapshot/restore_snapshot.html b/_site/partials/snapshot/restore_snapshot.html
@@ -28,7 +28,7 @@
     </div>
   </div>
   <div class="row">
-    <div class="form-group col-xs-6">
+    <div class="form-group col-lg-4">
       <label class="form-label">ignore_unavailable</label>
 
       <div class="row">
@@ -42,7 +42,21 @@
         </div>
       </div>
     </div>
-    <div class="form-group col-xs-6">
+    <div class="form-group col-lg-4">
+      <label class="form-label">include_aliases</label>
+
+      <div class="row">
+        <div class="col-xs-12">
+          <label class="cluster-map-node-type">
+            <input type="checkbox" ng-model="restore_snap.include_aliases" ng-true-value="true"> True
+          </label>
+          <label class="cluster-map-node-type">
+            <input type="checkbox" ng-model="restore_snap.include_aliases" ng-true-value="false"> False
+          </label>
+        </div>
+      </div>
+    </div>
+    <div class="form-group col-lg-4">
       <label class="form-label">include_global_state</label>
 
       <div class="row">

diff --git a/src/kopf/controllers/snapshot.js b/src/kopf/controllers/snapshot.js
@@ -95,10 +95,8 @@ kopf.controller('SnapshotController', ['$scope', 'ConfirmDialogService',
         body.indices = $scope.restore_snap.indices.join(',');
       }
 
-      if (angular.isDefined($scope.restore_snap.include_global_state)) {
-        body.include_global_state = $scope.restore_snap.include_global_state;
-      }
-
+      $scope.optionalParam(body, $scope.restore_snap, 'include_global_state');
+      $scope.optionalParam(body, $scope.restore_snap, 'include_aliases');
       $scope.optionalParam(body, $scope.restore_snap, 'ignore_unavailable');
       $scope.optionalParam(body, $scope.restore_snap, 'rename_replacement');
       $scope.optionalParam(body, $scope.restore_snap, 'rename_pattern');

diff --git a/tests/jasmine/repository.tests.js b/tests/jasmine/repository.tests.js
@@ -139,6 +139,7 @@ describe('SnapshotController', function() {
       "indices": ["idx-20140107", "idx-20140108"],
       "ignore_unavailable": false,
       "include_global_state": false,
+      "include_aliases": false,
       "rename_replacement": "-chicken-",
       "rename_pattern": "-",
       "snapshot": {"snapshot": "my_snap", "repository": "my_repo"}
@@ -147,6 +148,7 @@ describe('SnapshotController', function() {
     var expected = {
       "indices": "idx-20140107,idx-20140108",
       "include_global_state": false,
+      "include_aliases": false,
       "ignore_unavailable": false,
       "rename_replacement": "-chicken-",
       "rename_pattern": "-"
@@ -175,6 +177,7 @@ describe('SnapshotController', function() {
       "indices": ["idx-20140107", "idx-20140108"],
       "ignore_unavailable": false,
       "include_global_state": false,
+      "include_aliases": false,
       "rename_replacement": "-chicken-",
       "rename_pattern": "-",
       "snapshot": {"snapshot": "my_snap", "repository": "my_repo"}
@@ -183,6 +186,7 @@ describe('SnapshotController', function() {
     var expected = {
       "indices": "idx-20140107,idx-20140108",
       "include_global_state": false,
+      "include_aliases": false,
       "ignore_unavailable": false,
       "rename_replacement": "-chicken-",
       "rename_pattern": "-"