Skip to content
Permalink
Browse files

Merge pull request #725 from mikemand/hotfix/permissions-fix-take-two

Fix permissions (again)
  • Loading branch information...
nWidart committed Sep 11, 2019
2 parents 85a7c3e + 2513451 commit 23229290f1f266d89deba237be269379d5fccf5d
@@ -46,7 +46,7 @@
</div>
</div>
<div class="col-md-9">
<el-radio-group v-model="permissions[`${subPermissionTitle}`][`${permissionAction}`]">
<el-radio-group v-model="permissions[subPermissionTitle][permissionAction]">
<el-radio-button :label="1" @click="triggerEvent">{{ trans('roles.allow') }}</el-radio-button>
<el-radio-button v-if="!isRole" :label="0" @click="triggerEvent">{{ trans('roles.inherit') }}</el-radio-button>
<el-radio-button :label="-1" @click="triggerEvent">{{ trans('roles.deny') }}</el-radio-button>
@@ -8697,20 +8697,18 @@ var render = function() {
{
model: {
value:
_vm.permissions["" + subPermissionTitle][
"" + permissionAction
_vm.permissions[subPermissionTitle][
permissionAction
],
callback: function($$v) {
_vm.$set(
_vm.permissions[
"" + subPermissionTitle
],
"" + permissionAction,
_vm.permissions[subPermissionTitle],
permissionAction,
$$v
)
},
expression:
"permissions[`${subPermissionTitle}`][`${permissionAction}`]"
"permissions[subPermissionTitle][permissionAction]"
}
},
[
@@ -46,7 +46,7 @@
</div>
</div>
<div class="col-md-9">
<el-radio-group v-model="permissions[`${subPermissionTitle}.${permissionAction}`]">
<el-radio-group v-model="permissions[subPermissionTitle][permissionAction]">
<el-radio-button :label="1" @click="triggerEvent">{{ trans('roles.allow') }}</el-radio-button>
<el-radio-button v-if="!isRole" :label="0" @click="triggerEvent">{{ trans('roles.inherit') }}</el-radio-button>
<el-radio-button :label="-1" @click="triggerEvent">{{ trans('roles.deny') }}</el-radio-button>

0 comments on commit 2322929

Please sign in to comment.
You can’t perform that action at this time.