Kouhei Sutou
null+****@clear*****
Wed Dec 31 17:50:58 JST 2014
Kouhei Sutou 2014-12-31 17:50:58 +0900 (Wed, 31 Dec 2014) New Revision: 95c5ea5a8ae1b49b04d9e9051e9b9f25ee6cc695 https://github.com/groonga/groonga-admin/commit/95c5ea5a8ae1b49b04d9e9051e9b9f25ee6cc695 Message: column show: use meaningful labels Modified files: app/scripts/controllers/column-show-controller.js app/views/columns/show.html Modified: app/scripts/controllers/column-show-controller.js (+2 -10) =================================================================== --- app/scripts/controllers/column-show-controller.js 2014-12-31 17:42:42 +0900 (0a9b4f8) +++ app/scripts/controllers/column-show-controller.js 2014-12-31 17:50:58 +0900 (07b278e) @@ -16,10 +16,8 @@ angular.module('groongaAdminApp') function initialize() { $scope.column = { name: $routeParams.column, - properties: [], table: { - name: $routeParams.table, - columns: [] + name: $routeParams.table } }; } @@ -31,12 +29,6 @@ angular.module('groongaAdminApp') var table = schema.tables[$scope.column.table.name]; var column = table.columns[$scope.column.name]; - angular.forEach(column.properties, function(value, key) { - $scope.column.properties.push({name: key, value: value}); - }); - - angular.forEach(table.columns, function(value) { - $scope.column.table.columns.push(value); - }); + angular.extend($scope.column, column); }); }]); Modified: app/views/columns/show.html (+27 -3) =================================================================== --- app/views/columns/show.html 2014-12-31 17:42:42 +0900 (ed040bc) +++ app/views/columns/show.html 2014-12-31 17:50:58 +0900 (2ad63d4) @@ -18,9 +18,33 @@ <h2>Column: {{column.table.name}}.{{column.name}}</h2> <div class="column-properties"> <table> - <tr ng-repeat="property in column.properties track by $index"> - <th>{{property.name}}</th> - <td>{{property.value}}</td> + <tr> + <th>ID</th> + <td>{{column.id}}</td> + </tr> + <tr> + <th>Table</th> + <td><a href="#/tables/{{column.domain}}">{{column.domain}}</a></td> + </tr> + <tr> + <th>Name</th> + <td>{{column.name}}</td> + </tr> + <tr> + <th>Type</th> + <td>{{column.type}}</td> + </tr> + <tr> + <th>Value type</th> + <td>{{column.range}}</td> + </tr> + <tr> + <th>Value size type</th> + <td>{{column.sizeType}}</td> + </tr> + <tr> + <th>Path</th> + <td>{{column.path}}</td> </tr> </table> </div> -------------- next part -------------- HTML����������������������������...下载
