Revert "Use "show" instead of "inUse""

This reverts commit 2e518b6. I want to reconsider about it...
groonga · Nov 7, 2014 · bc93cd7 · bc93cd7
1 parent 2e518b6
commit bc93cd7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/app/scripts/controllers/table-search-controller.js b/app/scripts/controllers/table-search-controller.js
@@ -39,10 +39,10 @@ angular.module('groongaAdminApp')
       $scope.selectDrilldown = selectDrilldown;
     }
 
-    function packShowColumns(columns) {
+    function packInUseColumns(columns) {
       var targetColumnNames = columns
           .filter(function(column) {
-            return column.show;
+            return column.inUse;
           })
           .map(function(column) {
             return column.name;
@@ -52,8 +52,8 @@ angular.module('groongaAdminApp')
 
     function search() {
       var parameters = angular.copy($scope.parameters);
-      parameters.match_columns = packShowColumns($scope.indexedColumns);
-      parameters.output_columns = packShowColumns($scope.outputColumns);
+      parameters.match_columns = packInUseColumns($scope.indexedColumns);
+      parameters.output_columns = packInUseColumns($scope.outputColumns);
       parameters.offset = ($scope.currentPage - 1) * $scope.nRecordsInPage;
       parameters.limit = $scope.nRecordsInPage;
       var sortKeys = $scope.columns.filter(function(column) {
@@ -123,14 +123,14 @@ angular.module('groongaAdminApp')
 
     function addOutputColumn(name) {
       var outputColumns = $scope.parameters.output_columns;
-      var show = true;
+      var inUse = true;
       if (outputColumns) {
-        show = outputColumns.indexOf(name) !== -1;
+        inUse = outputColumns.indexOf(name) !== -1;
       }
       var drilldown = false;
       $scope.outputColumns.push({
         name: name,
-        show: show,
+        inUse: inUse,
         drilldown: drilldown
       });
     }
@@ -160,14 +160,14 @@ angular.module('groongaAdminApp')
           } else {
             localName = source.split('.')[1];
           }
-          var show = true;
+          var inUse = true;
           if (matchColumns) {
-            show = matchColumns.indexOf(localName) !== -1;
+            inUse = matchColumns.indexOf(localName) !== -1;
           }
           var drilldown = false;
           $scope.indexedColumns.push({
             name: localName,
-            show: show,
+            inUse: inUse,
             drilldown: drilldown
           });
         });

diff --git a/app/views/tables/search.html b/app/views/tables/search.html
@@ -31,7 +31,7 @@ <h2 class="panel-title">Columns</h2>
               <tr ng-repeat="outputColumn in outputColumns track by $index">
                 <td>{{outputColumn.name}}</td>
                 <td><input type="checkbox"
-                           ng-model="outputColumn.show"></td>
+                           ng-model="outputColumn.inUse"></td>
                 <td><input type="checkbox"
                            ng-model="outputColumn.drilldown"></td>
               </tr>