Merge "Add a groupBy function in tables"

This commit is contained in:
Jenkins 2015-05-15 14:07:08 +00:00 committed by Gerrit Code Review
commit b6242a529b
4 changed files with 6 additions and 3 deletions

View File

@ -2,6 +2,7 @@
angular.module('bansho', [ angular.module('bansho', [
'ngRoute', 'ngRoute',
'angular.filter',
'bansho.config', 'bansho.config',
'bansho.authentication', 'bansho.authentication',
'bansho.utils.promiseManager', 'bansho.utils.promiseManager',

View File

@ -9,8 +9,8 @@
</tr> </tr>
</thead> </thead>
<tbody class="{{entry.child_class}}" ng-repeat="entry in entries | actionbarSelectFilter:actionbarFilters.activeFilter | filter:actionbarFilters.searchFilter | noRepeat:this | wrappableStyle:this"> <tbody class="{{entry.child_class}}" ng-repeat="(groupByKey, groupByItems) in entries | groupBy:'host_name'">
<tr> <tr ng-repeat="entry in groupByItems | actionbarSelectFilter:actionbarFilters.activeFilter | filter:actionbarFilters.searchFilter | noRepeat:this | wrappableStyle:this">
<td><input type="checkbox" ng-model="entry.is_checked"></td> <td><input type="checkbox" ng-model="entry.is_checked"></td>
<td bansho-cell cell-name="{{cell}}" ng-repeat="cell in cellsName"></td> <td bansho-cell cell-name="{{cell}}" ng-repeat="cell in cellsName"></td>
</tr> </tr>

View File

@ -14,6 +14,7 @@
<!-- build:js js/app.min.js --> <!-- build:js js/app.min.js -->
<script src="bower_components/angular/angular.js"></script> <script src="bower_components/angular/angular.js"></script>
<script src="bower_components/angular-filter/dist/angular-filter.min.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script> <script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/jquery/dist/jquery.min.js"></script> <script src="bower_components/jquery/dist/jquery.min.js"></script>
<script src="bower_components/moment/moment.js"></script> <script src="bower_components/moment/moment.js"></script>

View File

@ -13,6 +13,7 @@
"bootstrap-sass-official": "3.3.1", "bootstrap-sass-official": "3.3.1",
"fontawesome": "4.2.0", "fontawesome": "4.2.0",
"justgage-toorshia": "master", "justgage-toorshia": "master",
"moment": "~2.9.0" "moment": "~2.9.0",
"angular-filter": "~0.5.4"
} }
} }