ps-toolkit-ui 0.0.24 → 0.0.28

package/bundles/ps-toolkit-ui.umd.js

@@ -153,6 +153,7 @@
                 RePassword: 'تکرار کلمه عبور',
                 PassportLetter: 'حرف',
                 Passport: 'گذرنامه',
+                List: 'لیست',
                 Priority: 'اولویت',
                 PassportImage: 'تصویر گذرنامه',
                 PassportExpireDate: 'تاریخ انقضاء گذرنامه',
@@ -2358,6 +2359,8 @@
             this.confirmShow = new core.EventEmitter();
             this.changeRows = new core.EventEmitter();
             this.loadParent = new core.EventEmitter();
+            this.optEdit = null;
+            this.optDelete = null;
             this.showChildren = null;
             this.addChildren = null;
             this.itemsWidth = 0;
@@ -2374,8 +2377,14 @@
                 var percent = _a.percent;
                 return a + percent;
             }, 0);
-            this.optEdit = new InputClass(this.table.environment, this.table.l, this.table.name + 'UpdateTitle', 'fad fa-pen', exports.InputType.Icon, 'blue h-25 m-h-5 d-ib va-m f-u');
-            this.optDelete = new InputClass(this.table.environment, this.table.l, this.table.name + 'DeleteTitle', 'fad fa-trash', exports.InputType.Icon, 'red h-25 m-h-5 d-ib va-m f-u');
+            var updateAccess = this.table.permissions.getAccess('Update');
+            var deleteAccess = this.table.permissions.getAccess('Delete');
+            if (updateAccess != null) {
+                this.optEdit = new InputClass(this.table.environment, this.table.l, updateAccess.Name, 'fad fa-pen', exports.InputType.Icon, 'blue h-25 m-h-5 d-ib va-m f-u');
+            }
+            if (deleteAccess != null) {
+                this.optDelete = new InputClass(this.table.environment, this.table.l, deleteAccess.Name, 'fad fa-trash', exports.InputType.Icon, 'red h-25 m-h-5 d-ib va-m f-u');
+            }
             if (this.table.hasChildren) {
                 if (!this.table.childrenAutoLoad) {
                     this.children = this.getChildren();
@@ -2418,54 +2427,58 @@
                 };
             }
             this.options = this.getOptions();
-            if (this.table.form) {
-                this.optEdit.onClick = function () {
-                    _this.table.form.url = _this.table.url + 'Update/' + _this.row.Id;
-                    if (_this.table.hasChildren && _this.row.ParentId != null) {
-                        _this.table.form.onSuccessBase = function () {
-                            _this.table.modal.hide();
-                            if (_this.table.childrenAutoLoad) {
-                                _this.loadParent.emit(_this.row.ParentId);
-                            }
-                            else {
+            if (this.optEdit !== null) {
+                if (this.table.form) {
+                    this.optEdit.onClick = function () {
+                        _this.table.form.url = _this.table.url + 'Update/' + _this.row.Id;
+                        if (_this.table.hasChildren && _this.row.ParentId != null) {
+                            _this.table.form.onSuccessBase = function () {
+                                _this.table.modal.hide();
+                                if (_this.table.childrenAutoLoad) {
+                                    _this.loadParent.emit(_this.row.ParentId);
+                                }
+                                else {
+                                    _this.table.load();
+                                }
+                            };
+                        }
+                        else {
+                            _this.table.form.onSuccessBase = function () {
+                                if (!_this.table.form.onTop) {
+                                    _this.table.modal.hide();
+                                }
+                                _this.table.form.clear();
                                 _this.table.load();
-                            }
-                        };
+                            };
+                        }
+                        _this.edit();
+                    };
+                }
+                else {
+                    this.optEdit.url = this.table.url + '/Update/' + this.row.Id;
+                }
+            }
+            if (this.optDelete != null) {
+                this.optDelete.onClick = function () {
+                    if (_this.table.form) {
+                        _this.table.form.clear();
+                    }
+                    if (_this.table.permissions.Type === exports.PermissionTypeEnum.Form) {
+                        _this.table.rows = _this.table.rows.filter(function (x) { return x.Id !== _this.row.Id; });
+                        _this.changeRows.emit(_this.row);
                     }
                     else {
-                        _this.table.form.onSuccessBase = function () {
-                            if (!_this.table.form.onTop) {
-                                _this.table.modal.hide();
-                            }
-                            _this.table.form.clear();
-                            _this.table.load();
-                        };
+                        _this.confirmShow.emit({ id: _this.row.Id, accept: function () {
+                                if (_this.table.hasChildren && _this.table.childrenAutoLoad && _this.row.ParentId != null) {
+                                    _this.loadParent.emit(_this.row.ParentId);
+                                }
+                                else {
+                                    _this.table.load();
+                                }
+                            } });
                     }
-                    _this.edit();
                 };
             }
-            else {
-                this.optEdit.url = this.table.url + '/Update/' + this.row.Id;
-            }
-            this.optDelete.onClick = function () {
-                if (_this.table.form) {
-                    _this.table.form.clear();
-                }
-                if (_this.table.permissions.Type === exports.PermissionTypeEnum.Form) {
-                    _this.table.rows = _this.table.rows.filter(function (x) { return x.Id !== _this.row.Id; });
-                    _this.changeRows.emit(_this.row);
-                }
-                else {
-                    _this.confirmShow.emit({ id: _this.row.Id, accept: function () {
-                            if (_this.table.hasChildren && _this.table.childrenAutoLoad && _this.row.ParentId != null) {
-                                _this.loadParent.emit(_this.row.ParentId);
-                            }
-                            else {
-                                _this.table.load();
-                            }
-                        } });
-                }
-            };
             if (this.table.sortable) {
                 this.setSortRow();
             }
@@ -2866,7 +2879,7 @@
     TableComponent.decorators = [
         { type: core.Component, args: [{
                     selector: 'lib-table',
-                    template: "<div [id]=\"table.id + 'Table'\" [style]=\"table.style\" #tableDiv [className]=\"(table.class ? table.class : '') + (table.sortable ? 'sortable' : '') + (table.hasChildren ? ' has-children' : '') + ' table-con'\">\r\n  <div *ngIf=\"table.displayLabel\" class=\"title\">\r\n    {{this.table.l(this.table.name + 'ListTitle')}}\r\n    <div class=\"extra-buttons\" *ngIf=\"table.extraButtons\">\r\n      <div *ngIf=\"table.permissions && table.permissions.hasAccess('Report')\" class=\"export\">\r\n        <lib-form-icon [inp]=\"export\"></lib-form-icon>\r\n        <div class=\"export-dropdown\" #exportDropDown>\r\n          <div (click)=\"report('Print')\" class=\"item\"><div class=\"text\">Print</div><i class=\"fad fa-print\"></i></div>\r\n          <div (click)=\"report('Excel')\" class=\"item\"><div class=\"text\">Excel</div><i class=\"fad fa-file-excel\"></i></div>\r\n          <div (click)=\"report('CSV')\" class=\"item\"><div class=\"text\">CSV</div><i class=\"fad fa-file-csv\"></i></div>\r\n          <div (click)=\"report('PDF')\" class=\"item\"><div class=\"text\">PDF</div><i class=\"fad fa-file-pdf\"></i></div>\r\n        </div>\r\n      </div>\r\n      <lib-form-icon [inp]=\"reload\"></lib-form-icon>\r\n      <lib-form-icon [inp]=\"maximum\"></lib-form-icon>\r\n    </div>\r\n    <div *ngIf=\"table.buttons.length > 0\" class=\"buttons\">\r\n      <lib-form-button [inp]=\"btn\" *ngFor=\"let btn of table.buttons\"></lib-form-button>\r\n    </div>\r\n  </div>\r\n  <div class=\"search-form\" *ngIf=\"table.searchForm\">\r\n    <lib-form [form]=\"table.searchForm\"></lib-form>\r\n  </div>\r\n  <lib-form *ngIf=\"table.form && table.form.onTop\" [form]=\"table.form\"></lib-form>\r\n  <table>\r\n    <thead>\r\n      <tr>\r\n        <th *ngIf=\"table.hasChildren\" style=\"width: 50px\"></th>\r\n        <th *ngIf=\"table.sortable\" style=\"width: 50px\"></th>\r\n        <th *ngIf=\"table.withSelect\" style=\"width: 50px\">\r\n          <i (click)=\"selectAll()\" [className]=\"(allSelected() ? 'fas fa-check-square green' : isSelected() ? 'fas fa-minus-square green' : 'far fa-square') + ' select-row'\" *ngIf=\"table.rows.length > 0\"></i>\r\n        </th>\r\n        <th (click)=\"!table.sortable && col.sort && changeSort($event, col.name)\" [className]=\"(!table.sortable && col.sort ? 'sort' : '')\" *ngFor=\"let col of table.cols\" [style]=\"{width: col.percent + '%'}\">\r\n          <i *ngIf=\"!table.sortable && col.sort\" [className]=\"'sort-icon fas' + (table.sort === col.name ? (table.sortType === 'ASC' ? ' fa-sort-up' : ' fa-sort-down') : ' fa-sort')\"></i>\r\n          <span *ngIf=\"col.search == null\">{{ table.l(col.name) }}</span>\r\n          <div class=\"w-90 header-search p-h-20 m-r-5\" *ngIf=\"!table.sortable && col.search != null\">\r\n            <lib-form-textbox *ngIf=\"col.type != colType.Date\" [inp]=\"col.search\"></lib-form-textbox>\r\n            <lib-form-date *ngIf=\"col.type == colType.Date\" [inp]=\"col.search\"></lib-form-date>\r\n          </div>\r\n        </th>\r\n<!--        <th *ngIf=\"table.hasOption()\" [style]=\"{width: (100 - itemsWidth) + '%'}\">-->\r\n<!--          <span *ngIf=\"!table.withSelect || !isSelected()\">{{ table.l('Options') }}</span>-->\r\n<!--          <span *ngIf=\"table.withSelect && isSelected()\" class=\"option-con\">-->\r\n<!--            <span *ngFor=\"let opt of options\">-->\r\n<!--              <lib-form-button *ngIf=\"opt.type == type.Button\" [inp]=\"opt\"></lib-form-button>-->\r\n<!--              <lib-form-icon *ngIf=\"opt.type == type.Icon\" [inp]=\"opt\"></lib-form-icon>-->\r\n<!--            </span>-->\r\n<!--          </span>-->\r\n<!--        </th>-->\r\n      </tr>\r\n    </thead>\r\n    <tbody #rows [style]=\"table.perPage > 0 ? {height: table.height * table.perPage + 'px'} : table.loading || !table.permission || table.rows.length == 0 ? {height: '100px'} : {}\">\r\n      <lib-table-row (confirmShow)=\"onConfirmShow($event)\" [level]=\"1\" (changeRows)=\"onChangeRows($event)\" [id]=\"row.id ? row.id : ''\" [table]=\"table\" [row]=\"row\" *ngFor=\"let row of getRows()\"></lib-table-row>\r\n      <tr *ngIf=\"table.perPage > 0\" [style]=\"{height: (table.perPage > 0 ? (table.perPage - table.rows.length) * table.height : '100') + 'px', visibility: 'hidden'}\"></tr>\r\n      <lib-table-loading [table]=\"table\"></lib-table-loading>\r\n    </tbody>\r\n    <tfoot>\r\n      <tr>\r\n        <td colspan=\"100%\">\r\n          <lib-table-pagination [table]=\"table\" *ngIf=\"table.perPage > 0\"></lib-table-pagination>\r\n        </td>\r\n      </tr>\r\n    </tfoot>\r\n  </table>\r\n  <lib-modal *ngIf=\"table.modal != null\" [modal]=\"table.modal\"></lib-modal>\r\n  <lib-modal [modal]=\"opt.modal\" *ngFor=\"let opt of getOptionModals()\"></lib-modal>\r\n  <lib-confirm #confirm [tableId]=\"table.name\"></lib-confirm>\r\n</div>\r\n",
+                    template: "<div [id]=\"table.id + 'Table'\" [style]=\"table.style\" #tableDiv [className]=\"(table.class ? table.class : '') + (table.sortable ? 'sortable' : '') + (table.hasChildren ? ' has-children' : '') + ' table-con'\">\r\n  <div *ngIf=\"table.displayLabel\" class=\"title\">\r\n    {{this.table.title ? this.table.title : 'List'}}\r\n    <div class=\"extra-buttons\" *ngIf=\"table.extraButtons\">\r\n      <div *ngIf=\"table.permissions && table.permissions.hasAccess('Report')\" class=\"export\">\r\n        <lib-form-icon [inp]=\"export\"></lib-form-icon>\r\n        <div class=\"export-dropdown\" #exportDropDown>\r\n          <div (click)=\"report('Print')\" class=\"item\"><div class=\"text\">Print</div><i class=\"fad fa-print\"></i></div>\r\n          <div (click)=\"report('Excel')\" class=\"item\"><div class=\"text\">Excel</div><i class=\"fad fa-file-excel\"></i></div>\r\n          <div (click)=\"report('CSV')\" class=\"item\"><div class=\"text\">CSV</div><i class=\"fad fa-file-csv\"></i></div>\r\n          <div (click)=\"report('PDF')\" class=\"item\"><div class=\"text\">PDF</div><i class=\"fad fa-file-pdf\"></i></div>\r\n        </div>\r\n      </div>\r\n      <lib-form-icon [inp]=\"reload\"></lib-form-icon>\r\n      <lib-form-icon [inp]=\"maximum\"></lib-form-icon>\r\n    </div>\r\n    <div *ngIf=\"table.buttons.length > 0\" class=\"buttons\">\r\n      <lib-form-button [inp]=\"btn\" *ngFor=\"let btn of table.buttons\"></lib-form-button>\r\n    </div>\r\n  </div>\r\n  <div class=\"search-form\" *ngIf=\"table.searchForm\">\r\n    <lib-form [form]=\"table.searchForm\"></lib-form>\r\n  </div>\r\n  <lib-form *ngIf=\"table.form && table.form.onTop\" [form]=\"table.form\"></lib-form>\r\n  <table>\r\n    <thead>\r\n      <tr>\r\n        <th *ngIf=\"table.hasChildren\" style=\"width: 50px\"></th>\r\n        <th *ngIf=\"table.sortable\" style=\"width: 50px\"></th>\r\n        <th *ngIf=\"table.withSelect\" style=\"width: 50px\">\r\n          <i (click)=\"selectAll()\" [className]=\"(allSelected() ? 'fas fa-check-square green' : isSelected() ? 'fas fa-minus-square green' : 'far fa-square') + ' select-row'\" *ngIf=\"table.rows.length > 0\"></i>\r\n        </th>\r\n        <th (click)=\"!table.sortable && col.sort && changeSort($event, col.name)\" [className]=\"(!table.sortable && col.sort ? 'sort' : '')\" *ngFor=\"let col of table.cols\" [style]=\"{width: col.percent + '%'}\">\r\n          <i *ngIf=\"!table.sortable && col.sort\" [className]=\"'sort-icon fas' + (table.sort === col.name ? (table.sortType === 'ASC' ? ' fa-sort-up' : ' fa-sort-down') : ' fa-sort')\"></i>\r\n          <span *ngIf=\"col.search == null\">{{ table.l(col.name) }}</span>\r\n          <div class=\"w-90 header-search p-h-20 m-r-5\" *ngIf=\"!table.sortable && col.search != null\">\r\n            <lib-form-textbox *ngIf=\"col.type != colType.Date\" [inp]=\"col.search\"></lib-form-textbox>\r\n            <lib-form-date *ngIf=\"col.type == colType.Date\" [inp]=\"col.search\"></lib-form-date>\r\n          </div>\r\n        </th>\r\n<!--        <th *ngIf=\"table.hasOption()\" [style]=\"{width: (100 - itemsWidth) + '%'}\">-->\r\n<!--          <span *ngIf=\"!table.withSelect || !isSelected()\">{{ table.l('Options') }}</span>-->\r\n<!--          <span *ngIf=\"table.withSelect && isSelected()\" class=\"option-con\">-->\r\n<!--            <span *ngFor=\"let opt of options\">-->\r\n<!--              <lib-form-button *ngIf=\"opt.type == type.Button\" [inp]=\"opt\"></lib-form-button>-->\r\n<!--              <lib-form-icon *ngIf=\"opt.type == type.Icon\" [inp]=\"opt\"></lib-form-icon>-->\r\n<!--            </span>-->\r\n<!--          </span>-->\r\n<!--        </th>-->\r\n      </tr>\r\n    </thead>\r\n    <tbody #rows [style]=\"table.perPage > 0 ? {height: table.height * table.perPage + 'px'} : table.loading || !table.permission || table.rows.length == 0 ? {height: '100px'} : {}\">\r\n      <lib-table-row (confirmShow)=\"onConfirmShow($event)\" [level]=\"1\" (changeRows)=\"onChangeRows($event)\" [id]=\"row.id ? row.id : ''\" [table]=\"table\" [row]=\"row\" *ngFor=\"let row of getRows()\"></lib-table-row>\r\n      <tr *ngIf=\"table.perPage > 0\" [style]=\"{height: (table.perPage > 0 ? (table.perPage - table.rows.length) * table.height : '100') + 'px', visibility: 'hidden'}\"></tr>\r\n      <lib-table-loading [table]=\"table\"></lib-table-loading>\r\n    </tbody>\r\n    <tfoot>\r\n      <tr>\r\n        <td colspan=\"100%\">\r\n          <lib-table-pagination [table]=\"table\" *ngIf=\"table.perPage > 0\"></lib-table-pagination>\r\n        </td>\r\n      </tr>\r\n    </tfoot>\r\n  </table>\r\n  <lib-modal *ngIf=\"table.modal != null\" [modal]=\"table.modal\"></lib-modal>\r\n  <lib-modal [modal]=\"opt.modal\" *ngFor=\"let opt of getOptionModals()\"></lib-modal>\r\n  <lib-confirm #confirm [tableId]=\"table.name\"></lib-confirm>\r\n</div>\r\n",
                     styles: [".table-con{background-color:#fff;border-radius:5px;box-shadow:var(--box-shadow-table);float:right;padding:20px;position:relative;width:100%}.table-con.maximum{border-radius:0;height:100%;overflow-y:auto;position:fixed;right:0;top:0;width:100%;z-index:11}.table-con>.title{float:right;font-family:VazirBold;font-size:16px;height:40px;line-height:40px;margin-bottom:10px;position:relative;text-align:right;width:100%}.table-con>.title .extra-buttons{float:left;margin-top:5px}.table-con>.title .extra-buttons .export{float:right;position:relative}.table-con>.title .extra-buttons .export .export-dropdown{background-color:#fff;border-radius:5px;box-shadow:var(--box-shadow-table);display:none;overflow:hidden;padding:15px 0;position:absolute;right:-50px;top:35px;width:130px;z-index:2}.table-con>.title .extra-buttons .export .export-dropdown .item{cursor:pointer;float:right;padding:0 15px;text-align:center;width:100%}.table-con>.title .extra-buttons .export .export-dropdown .item:hover{background-color:var(--black-22)}.table-con>.title .extra-buttons .export .export-dropdown .text{float:right;font-family:VazirLight;font-size:13px;height:40px;line-height:41px;width:70%}.table-con>.title .extra-buttons .export .export-dropdown i{color:var(--black-88);float:right;font-size:14px;height:40px;line-height:40px;width:30%}.table-con>.title .buttons{float:left;margin-left:10px;margin-top:5px}.table-con>.search-form{border-radius:5px;float:right;margin-bottom:5px;width:100%}.table-con table{border-spacing:0!important;width:100%}.table-con table thead tr{-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;-webkit-user-select:none;position:relative}.table-con table thead tr th{background-color:var(--base-11);color:var(--black-88);font-family:VazirLight;font-size:12px;font-weight:400;height:45px;position:relative;vertical-align:middle}.table-con table thead tr th:first-child{border-bottom-right-radius:5px;border-top-right-radius:5px}.table-con table thead tr th:last-child{border-bottom-left-radius:5px;border-top-left-radius:5px}.table-con table thead tr th.sort{cursor:pointer}.table-con table thead tr th .sort-icon{font-size:13px;height:20px;left:5px;line-height:20px;opacity:.6;position:absolute;top:calc(50% - 10px);width:20px}.table-con table tbody{position:relative}.table-con table tfoot tr{height:45px}.table-con table tfoot tr td{position:relative;vertical-align:bottom}::ng-deep .table-con:not(.sortable) table lib-table-row:last-of-type>tr:after{background-image:unset}::ng-deep .table-con table thead tr th .select-row{cursor:pointer;font-size:18px;height:30px;line-height:30px}"]
                 },] }
     ];
@@ -5040,14 +5053,13 @@
     };
 
     var PermissionClass = /** @class */ (function () {
-        function PermissionClass(Name, Icon, Type, Area, Controller, Action, Children, Accesses) {
+        function PermissionClass(Name, Icon, Type, Area, Controller, Action, Accesses) {
             if (Name === void 0) { Name = ''; }
             if (Icon === void 0) { Icon = ''; }
             if (Type === void 0) { Type = null; }
             if (Area === void 0) { Area = ''; }
             if (Controller === void 0) { Controller = ''; }
             if (Action === void 0) { Action = ''; }
-            if (Children === void 0) { Children = []; }
             if (Accesses === void 0) { Accesses = []; }
             this.Name = Name;
             this.Icon = Icon;
@@ -5055,11 +5067,14 @@
             this.Area = Area;
             this.Controller = Controller;
             this.Action = Action;
-            this.Children = Children;
             this.Accesses = Accesses;
             this.RelatedId = null;
             this.Condition = null;
         }
+        PermissionClass.prototype.getAccess = function (a) {
+            var c = this.Accesses.filter(function (x) { return x.Action === a && x.Type === exports.PermissionTypeEnum.Access; });
+            return c.length > 0 ? c[0] : null;
+        };
         PermissionClass.prototype.hasAccess = function (a) {
             return this.Accesses.filter(function (x) { return x.Action === a && x.Type === exports.PermissionTypeEnum.Access; }).length > 0;
         };
@@ -6880,16 +6895,17 @@
         }
         BaseComponent.prototype.getPermission = function () {
             var _this = this;
+            console.log('getPermissiongetPermissiongetPermissiongetPermission');
             var p = this.app.currentUser.Permissions.filter(function (per) { return per.Controller === _this.c && (_this.a == null || per.Action === _this.a) &&
                 per.Type === exports.PermissionTypeEnum.Item; });
             return p.length > 0 ? this.getPermissionClass(p[0]) : null;
         };
         BaseComponent.prototype.getPermissionClass = function (p) {
-            return new PermissionClass(p.Name, p.Icon, p.Type, p.Area, p.Controller, p.Action, [], this.getPermissionAccessesClass(p.Id));
+            return new PermissionClass(p.Name, p.Icon, p.Type, p.Area, p.Controller, p.Action, this.getPermissionAccessesClass(p.Id));
         };
         BaseComponent.prototype.getPermissionAccessesClass = function (parentId) {
             var _this = this;
-            return this.app.currentUser.Permissions.filter(function (x) { return x.ParentId = parentId; }).map(function (x) { return _this.getPermissionClass(x); });
+            return this.app.currentUser.Permissions.filter(function (x) { return x.ParentId === parentId; }).map(function (x) { return _this.getPermissionClass(x); });
         };
         BaseComponent.prototype.hasAccess = function (a) {
             return this.permissions ? this.permissions.hasAccess(a) : false;
@@ -6953,6 +6969,7 @@
             this.page = 1;
             this.sort = null;
             this.queryParams = {};
+            this.title = null;
             this.sortType = null;
             this.displayLabel = true;
             this.isReport = false;
@@ -7037,7 +7054,9 @@
             var _this = this;
             if (changeRows === void 0) { changeRows = null; }
             this.permission = true;
-            if (this.permissions && this.permissions.hasAccess('List')) {
+            var listAccess = this.permissions.getAccess('List');
+            if (this.permissions && listAccess !== null) {
+                this.title = listAccess.Name;
                 this.url = this.permissions.getUrl();
                 if (this.permissions.Type !== exports.PermissionTypeEnum.Form) {
                     this.load();
@@ -7050,8 +7069,9 @@
                 this.permission = false;
                 return;
             }
-            var insert = new InputClass(this.environment, this.l, this.name + 'InsertTitle', 'fad fa-plus fa-rotate-90', exports.InputType.Button, 'w-u green h-30');
-            if (this.permissions.hasAccess('Insert')) {
+            var insertAccess = this.permissions.getAccess('Insert');
+            if (insertAccess != null) {
+                var insert = new InputClass(this.environment, this.l, insertAccess.Name, 'fad fa-plus fa-rotate-90', exports.InputType.Button, 'w-u green h-30');
                 if (this.form) {
                     this.form.url = this.form.baseUrl = this.url + 'Insert';
                     if (!this.form.onTop) {
@@ -7069,8 +7089,15 @@
                     }
                 }
                 else {
-                    insert.url = this.url;
                     this.buttons.unshift(insert);
+                    if (this.modal) {
+                        insert.onClick = function () {
+                            _this.modal.show();
+                        };
+                    }
+                    else {
+                        insert.url = this.url + 'Insert';
+                    }
                 }
             }
             if ((this.permissions.hasAccess('Insert') || this.permissions.hasAccess('Update')) && this.form) {
@@ -7101,16 +7128,6 @@
                     this.modal.form = this.form;
                 }
             }
-            else {
-                if (this.modal) {
-                    insert.onClick = function () {
-                        _this.modal.show();
-                    };
-                }
-                else {
-                    insert.url = this.url + 'Insert';
-                }
-            }
             var _loop_1 = function (option) {
                 if (this_1.options.filter(function (x) { return x.name === option.Name; }).length > 0) {
                     return "continue";