ui fixes

src/lubasictable.css

@@ -0,0 +1,7 @@
+.lu-basic-table-pagination-current {
+    font-weight: bold;
+}
+
+.lu-basic-table-pagination-not-current {
+
+}

src/lubasictable.js

@@ -22,16 +22,12 @@ angular.module('luticateUtils')
                     }
                     if (typeof $scope.tableOptions.luBusy == 'string') {
                         $scope.tableOptions.luBusy = {
-                            group: $scope.tableOptions.luBusy,
-                            templateLoader: "luticate-loader.html",
-                            templateError: "luticate-error.html"
+                            group: $scope.tableOptions.luBusy
                         };
                     }
                     if ($scope.tableOptions.luBusy == null) {
                         $scope.tableOptions.luBusy = {
-                            group:  'luBasicTableItemList_' + $scope.$id,
-                            templateLoader: "luticate-loader.html",
-                            templateError: "luticate-error.html"
+                            group:  'luBasicTableItemList_' + $scope.$id
                         };
                     }
                     if ($scope.tableOptions.page == null) {
@@ -82,7 +78,7 @@ angular.module('luticateUtils')
                     $scope.loadPage = function (page) {
                         $scope.tableOptions.checkedItems = [];
                         var promiseLoadItems = {
-                            id: "promiseLoadItems",
+                            id: "promiseLoadItems_" + $scope.$id,
                             groups: [$scope.tableOptions.luBusy.group]
                         };
                         $scope.tableOptions.getLoadPagePromise(page, $scope.tableOptions.perPage, promiseLoadItems)
@@ -187,7 +183,8 @@ angular.module('luticateUtils').run(['$templateCache', function($templateCache)
 '</table>' +
 
 '<div class="col-sm-12 text-center">' +
-'    <a class="{{ p == tableOptions.page ? \'pagination-current\' : \'pagination-not-current\'}}" href="" ng-repeat="p in pages" ng-click="loadPage(p)">{{ p + 1 }}&nbsp;</a>' +
+'    <a class="{{ p == tableOptions.page ? \'lu-basic-table-pagination-current\' : \'lu-basic-table-pagination-not-current\'}}"' +
+        'href="" ng-repeat="p in pages" ng-click="loadPage(p)">{{ p + 1 }}&nbsp;</a>' +
 '</div>' +
 '    </div>');
 }]);

src/luedittable.js

@@ -31,18 +31,27 @@ angular.module('luticateUtils')
                         {
                         }
                     }
-                    var onItemClicked = $scope.tableOptions.onItemClicked;
-                    $scope.tableOptions.onItemClicked = function (item) {
-                        if (onItemClicked != null) {
-                            onItemClicked(item);
+                    if ($scope.tableOptions.onItemClicked == null) {
+                        $scope.tableOptions.onItemClicked = function (item) {
+                            var ctrl = $scope.tableOptions.getEditController();
+                            dialogs.create('views/modals/' + ctrl.toLowerCase() + '.html', ctrl + 'Controller', item)
+                                .result.then(function (data) {
+                                    $scope.tableOptions.luBasicTableScope.loadPage($scope.tableOptions.page);
+                                    $scope.tableOptions.onItemEdited(data);
+                                });
+                        };
+                    }
+                    if ($scope.tableOptions.addItem == null) {
+                        $scope.tableOptions.addItem = function()
+                        {
+                            var ctrl = $scope.tableOptions.getEditController();
+                            dialogs.create('views/modals/' + ctrl.toLowerCase() + '.html', ctrl + 'Controller', $scope.tableOptions.editData)
+                                .result.then(function (data) {
+                                    $scope.tableOptions.luBasicTableScope.loadPage($scope.tableOptions.page);
+                                    $scope.tableOptions.onItemAdded(data);
+                                });
                         }
-                        var ctrl = $scope.tableOptions.getEditController();
-                        dialogs.create('views/modals/' + ctrl.toLowerCase() + '.html', ctrl + 'Controller', item)
-                            .result.then(function (data) {
-                                $scope.tableOptions.luBasicTableScope.loadPage($scope.tableOptions.page);
-                                $scope.tableOptions.onItemEdited(data);
-                            });
-                    };
+                    }
 
 
                     if ($scope.tableOptions.canDel == null) {
@@ -113,15 +122,6 @@ angular.module('luticateUtils')
                                     });
                             });
                     };
-
-                    $scope.addItem = function () {
-                        var ctrl = $scope.tableOptions.getEditController();
-                        dialogs.create('views/modals/' + ctrl.toLowerCase() + '.html', ctrl + 'Controller', null)
-                            .result.then(function (data) {
-                                $scope.tableOptions.luBasicTableScope.loadPage($scope.tableOptions.page);
-                                $scope.tableOptions.onItemAdded(data);
-                            });
-                    };
                 }
             };
         }
@@ -136,7 +136,7 @@ angular.module('luticateUtils').run(['$templateCache', function($templateCache)
 'ng-disabled="tableOptions.checkedItems.length == 0" ng-show="tableOptions.canDel()">' +
 '    <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Delete' +
 '    </button>' +
-'    <button class="btn btn-default" type="button" ng-click="addItem()" ng-show="tableOptions.canAdd()">' +
+'    <button class="btn btn-default" type="button" ng-click="tableOptions.addItem()" ng-show="tableOptions.canAdd()">' +
 '    <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add' +
 '    </button>' +
 '    </div>');

src/lupermissionsedit.js

@@ -93,7 +93,7 @@ angular.module('luticateUtils')
 
                         var promiseLoadAllPermissions = {
                             id: "promiseLoadAllPermissions",
-                            groups: ['permission_add']
+                            groups: ['permissionList']
                         };
                         luticateAuthPermissions.getAll(null, promiseLoadAllPermissions)
                             .then(function (permissions) {

src/lupickertable.css

@@ -0,0 +1,6 @@
+.lu-picker-table-picked-items {
+    background-color: rgba(47, 47, 47, 0.2);
+    border: solid rgb(47, 47, 47) 1px;
+    margin: 2px 2px 2px 2px;
+    cursor: pointer;
+}

src/lupickertable.js

@@ -76,6 +76,20 @@ angular.module('luticateUtils')
                     {
                         return true;
                     };
+
+                    $scope.unPickItem = function(item)
+                    {
+                        var id = $scope.pickerOptions.getItemId(item);
+                        if ($scope.pickerOptions.checkedItems.find(function(it)
+                            {
+                                return it == id;
+                            }) != null) {
+                            $scope.pickerOptions.luBasicTableScope.toggleCheckedId(id, item);
+                        }
+                        else {
+                            $scope.pickerOptions.onItemChecked(item, false);
+                        }
+                    }
                 }
             };
         }