6745-2404_testToMaster #1950

Merged
alexm merged 191 commits from 6745-2404_testToMaster into master 2024-01-25 07:39:13 +00:00
12 changed files with 24 additions and 24 deletions
Showing only changes of commit 01e7135224 - Show all commits

View File

@ -15,7 +15,7 @@
<vn-autocomplete <vn-autocomplete
label="Role" label="Role"
ng-model="$ctrl.acl.principalId" ng-model="$ctrl.acl.principalId"
url="Roles" url="VnRoles"
id-field="name" id-field="name"
value-field="name" value-field="name"
vn-focus> vn-focus>

View File

@ -4,7 +4,7 @@
<vn-autocomplete <vn-autocomplete
label="Role" label="Role"
ng-model="filter.principalId" ng-model="filter.principalId"
url="Roles" url="VnRoles"
value-field="name"> value-field="name">
</vn-autocomplete> </vn-autocomplete>
<vn-autocomplete <vn-autocomplete

View File

@ -30,7 +30,7 @@
<vn-autocomplete <vn-autocomplete
label="Role" label="Role"
ng-model="$ctrl.user.roleFk" ng-model="$ctrl.user.roleFk"
url="Roles" url="VnRoles"
rule="VnUser"> rule="VnUser">
</vn-autocomplete> </vn-autocomplete>
<vn-textfield <vn-textfield

View File

@ -22,7 +22,7 @@
<vn-autocomplete <vn-autocomplete
label="Role" label="Role"
ng-model="$ctrl.user.roleFk" ng-model="$ctrl.user.roleFk"
url="Roles"> url="VnRoles">
</vn-autocomplete> </vn-autocomplete>
</vn-vertical> </vn-vertical>
</vn-card> </vn-card>

View File

@ -1,6 +1,6 @@
<vn-watcher <vn-watcher
vn-id="watcher" vn-id="watcher"
url="Roles" url="VnRoles"
data="$ctrl.role" data="$ctrl.role"
form="form"> form="form">
</vn-watcher> </vn-watcher>

View File

@ -3,7 +3,7 @@ import ModuleCard from 'salix/components/module-card';
class Controller extends ModuleCard { class Controller extends ModuleCard {
reload() { reload() {
this.$http.get(`Roles/${this.$params.id}`) this.$http.get(`VnRoles/${this.$params.id}`)
.then(res => this.role = res.data); .then(res => this.role = res.data);
} }
} }

View File

@ -1,6 +1,6 @@
<vn-watcher <vn-watcher
vn-id="watcher" vn-id="watcher"
url="Roles" url="VnRoles"
data="$ctrl.role" data="$ctrl.role"
insert-mode="true" insert-mode="true"
form="form"> form="form">

View File

@ -11,7 +11,7 @@ class Controller extends Descriptor {
} }
onDelete() { onDelete() {
return this.$http.delete(`Roles/${this.id}`) return this.$http.delete(`VnRoles/${this.id}`)
.then(() => this.$state.go('account.role')) .then(() => this.$state.go('account.role'))
.then(() => this.vnApp.showSuccess(this.$t('Role removed'))); .then(() => this.vnApp.showSuccess(this.$t('Role removed')));
} }

View File

@ -1,6 +1,6 @@
<vn-crud-model <vn-crud-model
vn-id="model" vn-id="model"
url="Roles" url="VnRoles"
filter="::$ctrl.filter" filter="::$ctrl.filter"
limit="20"> limit="20">
</vn-crud-model> </vn-crud-model>

View File

@ -40,7 +40,7 @@
<vn-autocomplete <vn-autocomplete
label="Role" label="Role"
ng-model="$ctrl.addData.inheritsFrom" ng-model="$ctrl.addData.inheritsFrom"
url="Roles" url="VnRoles"
vn-focus> vn-focus>
</vn-autocomplete> </vn-autocomplete>
</tpl-body> </tpl-body>

View File

@ -6,7 +6,7 @@ class Controller extends Component {
this._role = value; this._role = value;
this.$.summary = null; this.$.summary = null;
if (!value) return; if (!value) return;
this.$http.get(`Roles/${value.id}`) this.$http.get(`VnRoles/${value.id}`)
.then(res => this.$.summary = res.data); .then(res => this.$.summary = res.data);
} }

View File

@ -19,7 +19,7 @@
vn-one vn-one
label="Role" label="Role"
ng-model="filter.roleFk" ng-model="filter.roleFk"
url="Roles" url="VnRoles"
value-field="id" value-field="id"
show-field="name"> show-field="name">
</vn-autocomplete> </vn-autocomplete>