diff --git a/src/ui/static/resources/js/components/paginator/paginator.directive.html b/src/ui/static/resources/js/components/paginator/paginator.directive.html index 73cc77c4b..800604c60 100644 --- a/src/ui/static/resources/js/components/paginator/paginator.directive.html +++ b/src/ui/static/resources/js/components/paginator/paginator.directive.html @@ -12,3 +12,4 @@ +

// 'total' | tr // // vm.totalCount // // 'items' | tr //

\ No newline at end of file diff --git a/src/ui/static/resources/js/components/paginator/paginator.directive.js b/src/ui/static/resources/js/components/paginator/paginator.directive.js index d9e08be0b..01c157e3c 100644 --- a/src/ui/static/resources/js/components/paginator/paginator.directive.js +++ b/src/ui/static/resources/js/components/paginator/paginator.directive.js @@ -106,11 +106,10 @@ if(this.time > this.minimum) { if(this.time === 0) { ctrl.page = ctrl.displayCount; - }else if((ctrl.page % ctrl.displayCount) != 0) { + }else{ ctrl.page = this.time * ctrl.displayCount; } --this.time; - --ctrl.page; } scope.$apply(); }; diff --git a/src/ui/static/resources/js/components/user/list-user.directive.html b/src/ui/static/resources/js/components/user/list-user.directive.html index 10147219e..7d524634a 100644 --- a/src/ui/static/resources/js/components/user/list-user.directive.html +++ b/src/ui/static/resources/js/components/user/list-user.directive.html @@ -55,7 +55,7 @@
-
//vm.users ? vm.users.length : 0// items
+
//vm.users ? vm.users.length : 0// // 'items' | tr //
diff --git a/src/ui/static/resources/js/services/i18n/locale_messages_en-US.js b/src/ui/static/resources/js/services/i18n/locale_messages_en-US.js index 39de11118..e665274af 100644 --- a/src/ui/static/resources/js/services/i18n/locale_messages_en-US.js +++ b/src/ui/static/resources/js/services/i18n/locale_messages_en-US.js @@ -96,6 +96,7 @@ var locale_messages = { 'save': 'Save', 'cancel': 'Cancel', 'confirm': 'Confirm', + 'total': 'Total', 'items': 'item(s)', 'add_member': 'Add Member', 'operation': 'Operation', diff --git a/src/ui/static/resources/js/services/i18n/locale_messages_zh-CN.js b/src/ui/static/resources/js/services/i18n/locale_messages_zh-CN.js index b57d3c42a..78ac605cb 100644 --- a/src/ui/static/resources/js/services/i18n/locale_messages_zh-CN.js +++ b/src/ui/static/resources/js/services/i18n/locale_messages_zh-CN.js @@ -96,6 +96,7 @@ var locale_messages = { 'save': '保存', 'cancel': '取消', 'confirm': '确认', + 'total': '总计', 'items': '条记录', 'add_member': '新增成员', 'operation': '操作',