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>
@ -32,7 +32,7 @@
</vn-horizontal> </vn-horizontal>
<vn-horizontal> <vn-horizontal>
<vn-textfield <vn-textfield
label="Property" label="Property"
ng-model="$ctrl.acl.property" ng-model="$ctrl.acl.property"
info="Use * to match all properties"> info="Use * to match all properties">
</vn-textfield> </vn-textfield>

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
@ -15,7 +15,7 @@
value-field="name"> value-field="name">
</vn-autocomplete> </vn-autocomplete>
<vn-textfield <vn-textfield
label="Property" label="Property"
ng-model="filter.property"> ng-model="filter.property">
</vn-textfield> </vn-textfield>
<vn-autocomplete <vn-autocomplete
@ -36,4 +36,4 @@
</vn-submit> </vn-submit>
</vn-vertical> </vn-vertical>
</form> </form>
</div> </div>

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>
@ -11,13 +11,13 @@
<vn-card class="vn-pa-lg"> <vn-card class="vn-pa-lg">
<vn-vertical> <vn-vertical>
<vn-textfield <vn-textfield
label="Name" label="Name"
ng-model="$ctrl.role.name" ng-model="$ctrl.role.name"
rule rule
vn-focus> vn-focus>
</vn-textfield> </vn-textfield>
<vn-textfield <vn-textfield
label="Description" label="Description"
ng-model="$ctrl.role.description" ng-model="$ctrl.role.description"
rule> rule>
</vn-textfield> </vn-textfield>
@ -35,4 +35,4 @@
ng-click="watcher.loadOriginalData()"> ng-click="watcher.loadOriginalData()">
</vn-button> </vn-button>
</vn-button-bar> </vn-button-bar>
</form> </form>

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">
@ -12,13 +12,13 @@
<vn-card class="vn-pa-lg"> <vn-card class="vn-pa-lg">
<vn-vertical> <vn-vertical>
<vn-textfield <vn-textfield
label="Name" label="Name"
ng-model="$ctrl.role.name" ng-model="$ctrl.role.name"
rule rule
vn-focus> vn-focus>
</vn-textfield> </vn-textfield>
<vn-textfield <vn-textfield
label="Description" label="Description"
ng-model="$ctrl.role.description" ng-model="$ctrl.role.description"
rule> rule>
</vn-textfield> </vn-textfield>

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>
@ -15,4 +15,4 @@
</vn-portal> </vn-portal>
<ui-view> <ui-view>
<vn-role-index></vn-role-index> <vn-role-index></vn-role-index>
</ui-view> </ui-view>

View File

@ -33,14 +33,14 @@
ng-click="$ctrl.onAddClick()" ng-click="$ctrl.onAddClick()"
fixed-bottom-right> fixed-bottom-right>
</vn-float-button> </vn-float-button>
<vn-dialog <vn-dialog
vn-id="dialog" vn-id="dialog"
on-accept="$ctrl.onAddSave()"> on-accept="$ctrl.onAddSave()">
<tpl-body> <tpl-body>
<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>
@ -49,7 +49,7 @@
<button response="accept" translate>Save</button> <button response="accept" translate>Save</button>
</tpl-buttons> </tpl-buttons>
</vn-dialog> </vn-dialog>
<vn-confirm <vn-confirm
vn-id="remove-confirm" vn-id="remove-confirm"
message="Role will be removed" message="Role will be removed"
question="Are you sure you want to continue?" question="Are you sure you want to continue?"

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>
@ -28,4 +28,4 @@
<vn-submit label="Search"></vn-submit> <vn-submit label="Search"></vn-submit>
</vn-horizontal> </vn-horizontal>
</form> </form>
</div> </div>