Kouhei Sutou
null+****@clear*****
Wed Dec 31 16:27:58 JST 2014
Kouhei Sutou 2014-12-31 16:27:58 +0900 (Wed, 31 Dec 2014) New Revision: 253fba7bec0d674b3165103b5543477f26d00a2d https://github.com/groonga/groonga-admin/commit/253fba7bec0d674b3165103b5543477f26d00a2d Message: Link to column Modified files: app/scripts/controllers/table-show-controller.js app/views/tables/show.html Modified: app/scripts/controllers/table-show-controller.js (+0 -10) =================================================================== --- app/scripts/controllers/table-show-controller.js 2014-12-31 11:39:21 +0900 (92666c6) +++ app/scripts/controllers/table-show-controller.js 2014-12-31 16:27:58 +0900 (452d97d) @@ -17,7 +17,6 @@ angular.module('groongaAdminApp') $scope.table = { name: $routeParams.table, properties: [], - columnPropertyNames: [], columns: [] }; $scope.tables = []; @@ -39,15 +38,6 @@ angular.module('groongaAdminApp') $scope.table.columns = columns.sort(function(column1, column2) { return (column1.name > column2.name) ? 1 : -1; }); - var representingColumn = columns.find(function(column) { - return column.name[0] !== '_'; - }); - representingColumn = representingColumn || columns[0]; - if (representingColumn) { - angular.forEach(representingColumn.properties, function(value, key) { - $scope.table.columnPropertyNames.push(key); - }); - } var tables = []; angular.forEach(schema.tables, function(value) { Modified: app/views/tables/show.html (+17 -5) =================================================================== --- app/views/tables/show.html 2014-12-31 11:39:21 +0900 (6c00bcf) +++ app/views/tables/show.html 2014-12-31 16:27:58 +0900 (56ed0da) @@ -43,16 +43,28 @@ <table> <thead> <tr> - <th ng-repeat="name in table.columnPropertyNames track by $index"> - {{name}} - </th> + <th>id</th> + <th>name</th> + <th>flags</th> + <th>domain</th> + <th>range</th> + <th>sources</th> + <th>path</th> </tr> </thead> <tbody> <tr ng-repeat="column in table.columns track by $index"> - <td ng-repeat="name in table.columnPropertyNames track by $index"> - {{column.properties[name]}} + <td>{{column.id}}</td> + <td> + <a href="#/tables/{{table.name}}/columns/{{column.name}}"> + {{column.name}} + </a> </td> + <td>{{column.flags}}</td> + <td>{{column.domain}}</td> + <td>{{column.range}}</td> + <td>{{column.sources}}</td> + <td>{{column.path}}</td> </tr> </tbody> </table> -------------- next part -------------- HTML����������������������������...다운로드
