groonga/groonga-admin at 6b50e73 [master] Rename "outputColumns" to "allColumns" (Groonga-commit) - Groonga - fulltext search engine.

Kouhei Sutou	2014-11-07 17:43:41 +0900 (Fri, 07 Nov 2014)

  New Revision: 6b50e734d2daa17fa169bc2d29dcf13f2a490412
  https://github.com/groonga/groonga-admin/commit/6b50e734d2daa17fa169bc2d29dcf13f2a490412

  Message:
    Rename "outputColumns" to "allColumns"
    
    Because they have "drilldown" info.

  Modified files:
    app/scripts/controllers/table-search-controller.js
    app/views/tables/search.html

  Modified: app/scripts/controllers/table-search-controller.js (+7 -7)
===================================================================

--- app/scripts/controllers/table-search-controller.js    2014-11-07 17:38:49 +0900 (a8c4e95)
+++ app/scripts/controllers/table-search-controller.js    2014-11-07 17:43:41 +0900 (d9f6239)
@@ -27,7 +27,7 @@ angular.module('groongaAdminApp')
         nTotalRecords: 0
       };
       $scope.indexedColumns = [];
-      $scope.outputColumns = [];
+      $scope.allColumns = [];
       $scope.commandLine = '';
       $scope.message = '';
       $scope.currentPage = 1;
@@ -55,7 +55,7 @@ angular.module('groongaAdminApp')
     function search() {
       var parameters = angular.copy($scope.parameters);
       parameters.match_columns = packInUseColumns($scope.indexedColumns);
-      parameters.output_columns = packInUseColumns($scope.outputColumns);
+      parameters.output_columns = packInUseColumns($scope.allColumns);
       parameters.offset = ($scope.currentPage - 1) * $scope.nRecordsInPage;
       parameters.limit = $scope.nRecordsInPage;
       var sortKeys = $scope.columns.filter(function(column) {
@@ -123,18 +123,18 @@ angular.module('groongaAdminApp')
       search();
     }
 
-    function addOutputColumn(name) {
+    function createColumnInfo(name) {
       var outputColumns = $scope.parameters.output_columns;
       var inUse = true;
       if (outputColumns) {
         inUse = outputColumns.indexOf(name) !== -1;
       }
       var drilldown = false;
-      $scope.outputColumns.push({
+      return {
         name: name,
         inUse: inUse,
         drilldown: drilldown
-      });
+      };
     }
 
     function extractColumnsInfo(table, columns) {
@@ -143,7 +143,7 @@ angular.module('groongaAdminApp')
           if (column.isIndex) {
             return;
           }
-          addOutputColumn(column.name);
+          $scope.allColumns.push(createColumnInfo(column.name));
         });
       }
 
@@ -178,7 +178,7 @@ angular.module('groongaAdminApp')
 
     function extractTableInfo(table) {
       if (table.name === $scope.table) {
-        addOutputColumn('_id');
+        $scope.allColumns.push(createColumnInfo('_id'));
       }
 
       client.execute('column_list', {table: table.name})

  Modified: app/views/tables/search.html (+4 -4)
===================================================================
--- app/views/tables/search.html    2014-11-07 17:38:49 +0900 (5162152)
+++ app/views/tables/search.html    2014-11-07 17:43:41 +0900 (734e9b6)
@@ -28,12 +28,12 @@
               </tr>
             </thead>
             <tbody>
-              <tr ng-repeat="outputColumn in outputColumns track by $index">
-                <td>{{outputColumn.name}}</td>
+              <tr ng-repeat="column in allColumns track by $index">
+                <td>{{column.name}}</td>
                 <td><input type="checkbox"
-                           ng-model="outputColumn.inUse"></td>
+                           ng-model="column.inUse"></td>
                 <td><input type="checkbox"
-                           ng-model="outputColumn.drilldown"></td>
+                           ng-model="column.drilldown"></td>
               </tr>
             </tbody>
           </table>
-------------- next part --------------
HTML����������������������������...
下載 


Groonga - fulltext search engine.

[Groonga-commit] groonga/groonga-admin at 6b50e73 [master] Rename "outputColumns" to "allColumns"