refs #5666 feat: replace Role by VnRole in front
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
This commit is contained in:
parent
16001099b6
commit
01e7135224
|
@ -15,7 +15,7 @@
|
|||
<vn-autocomplete
|
||||
label="Role"
|
||||
ng-model="$ctrl.acl.principalId"
|
||||
url="Roles"
|
||||
url="VnRoles"
|
||||
id-field="name"
|
||||
value-field="name"
|
||||
vn-focus>
|
||||
|
@ -32,7 +32,7 @@
|
|||
</vn-horizontal>
|
||||
<vn-horizontal>
|
||||
<vn-textfield
|
||||
label="Property"
|
||||
label="Property"
|
||||
ng-model="$ctrl.acl.property"
|
||||
info="Use * to match all properties">
|
||||
</vn-textfield>
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
<vn-autocomplete
|
||||
label="Role"
|
||||
ng-model="filter.principalId"
|
||||
url="Roles"
|
||||
url="VnRoles"
|
||||
value-field="name">
|
||||
</vn-autocomplete>
|
||||
<vn-autocomplete
|
||||
|
@ -15,7 +15,7 @@
|
|||
value-field="name">
|
||||
</vn-autocomplete>
|
||||
<vn-textfield
|
||||
label="Property"
|
||||
label="Property"
|
||||
ng-model="filter.property">
|
||||
</vn-textfield>
|
||||
<vn-autocomplete
|
||||
|
@ -36,4 +36,4 @@
|
|||
</vn-submit>
|
||||
</vn-vertical>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
<vn-autocomplete
|
||||
label="Role"
|
||||
ng-model="$ctrl.user.roleFk"
|
||||
url="Roles"
|
||||
url="VnRoles"
|
||||
rule="VnUser">
|
||||
</vn-autocomplete>
|
||||
<vn-textfield
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
<vn-autocomplete
|
||||
label="Role"
|
||||
ng-model="$ctrl.user.roleFk"
|
||||
url="Roles">
|
||||
url="VnRoles">
|
||||
</vn-autocomplete>
|
||||
</vn-vertical>
|
||||
</vn-card>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<vn-watcher
|
||||
vn-id="watcher"
|
||||
url="Roles"
|
||||
url="VnRoles"
|
||||
data="$ctrl.role"
|
||||
form="form">
|
||||
</vn-watcher>
|
||||
|
@ -11,13 +11,13 @@
|
|||
<vn-card class="vn-pa-lg">
|
||||
<vn-vertical>
|
||||
<vn-textfield
|
||||
label="Name"
|
||||
label="Name"
|
||||
ng-model="$ctrl.role.name"
|
||||
rule
|
||||
vn-focus>
|
||||
</vn-textfield>
|
||||
<vn-textfield
|
||||
label="Description"
|
||||
label="Description"
|
||||
ng-model="$ctrl.role.description"
|
||||
rule>
|
||||
</vn-textfield>
|
||||
|
@ -35,4 +35,4 @@
|
|||
ng-click="watcher.loadOriginalData()">
|
||||
</vn-button>
|
||||
</vn-button-bar>
|
||||
</form>
|
||||
</form>
|
||||
|
|
|
@ -3,7 +3,7 @@ import ModuleCard from 'salix/components/module-card';
|
|||
|
||||
class Controller extends ModuleCard {
|
||||
reload() {
|
||||
this.$http.get(`Roles/${this.$params.id}`)
|
||||
this.$http.get(`VnRoles/${this.$params.id}`)
|
||||
.then(res => this.role = res.data);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<vn-watcher
|
||||
vn-id="watcher"
|
||||
url="Roles"
|
||||
url="VnRoles"
|
||||
data="$ctrl.role"
|
||||
insert-mode="true"
|
||||
form="form">
|
||||
|
@ -12,13 +12,13 @@
|
|||
<vn-card class="vn-pa-lg">
|
||||
<vn-vertical>
|
||||
<vn-textfield
|
||||
label="Name"
|
||||
label="Name"
|
||||
ng-model="$ctrl.role.name"
|
||||
rule
|
||||
vn-focus>
|
||||
</vn-textfield>
|
||||
<vn-textfield
|
||||
label="Description"
|
||||
label="Description"
|
||||
ng-model="$ctrl.role.description"
|
||||
rule>
|
||||
</vn-textfield>
|
||||
|
|
|
@ -11,7 +11,7 @@ class Controller extends Descriptor {
|
|||
}
|
||||
|
||||
onDelete() {
|
||||
return this.$http.delete(`Roles/${this.id}`)
|
||||
return this.$http.delete(`VnRoles/${this.id}`)
|
||||
.then(() => this.$state.go('account.role'))
|
||||
.then(() => this.vnApp.showSuccess(this.$t('Role removed')));
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<vn-crud-model
|
||||
vn-id="model"
|
||||
url="Roles"
|
||||
url="VnRoles"
|
||||
filter="::$ctrl.filter"
|
||||
limit="20">
|
||||
</vn-crud-model>
|
||||
|
@ -15,4 +15,4 @@
|
|||
</vn-portal>
|
||||
<ui-view>
|
||||
<vn-role-index></vn-role-index>
|
||||
</ui-view>
|
||||
</ui-view>
|
||||
|
|
|
@ -33,14 +33,14 @@
|
|||
ng-click="$ctrl.onAddClick()"
|
||||
fixed-bottom-right>
|
||||
</vn-float-button>
|
||||
<vn-dialog
|
||||
<vn-dialog
|
||||
vn-id="dialog"
|
||||
on-accept="$ctrl.onAddSave()">
|
||||
<tpl-body>
|
||||
<vn-autocomplete
|
||||
label="Role"
|
||||
ng-model="$ctrl.addData.inheritsFrom"
|
||||
url="Roles"
|
||||
url="VnRoles"
|
||||
vn-focus>
|
||||
</vn-autocomplete>
|
||||
</tpl-body>
|
||||
|
@ -49,7 +49,7 @@
|
|||
<button response="accept" translate>Save</button>
|
||||
</tpl-buttons>
|
||||
</vn-dialog>
|
||||
<vn-confirm
|
||||
<vn-confirm
|
||||
vn-id="remove-confirm"
|
||||
message="Role will be removed"
|
||||
question="Are you sure you want to continue?"
|
||||
|
|
|
@ -6,7 +6,7 @@ class Controller extends Component {
|
|||
this._role = value;
|
||||
this.$.summary = null;
|
||||
if (!value) return;
|
||||
this.$http.get(`Roles/${value.id}`)
|
||||
this.$http.get(`VnRoles/${value.id}`)
|
||||
.then(res => this.$.summary = res.data);
|
||||
}
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
vn-one
|
||||
label="Role"
|
||||
ng-model="filter.roleFk"
|
||||
url="Roles"
|
||||
url="VnRoles"
|
||||
value-field="id"
|
||||
show-field="name">
|
||||
</vn-autocomplete>
|
||||
|
@ -28,4 +28,4 @@
|
|||
<vn-submit label="Search"></vn-submit>
|
||||
</vn-horizontal>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Reference in New Issue