mirror of
https://github.com/documize/community.git
synced 2025-07-20 05:39:42 +02:00
Fix space permissions group vs. user role overriding
This commit is contained in:
parent
e1d2d4c037
commit
ad4030bc17
11 changed files with 691 additions and 680 deletions
|
@ -19,6 +19,7 @@ export default Component.extend(ModalMixin, {
|
|||
groupSvc: service('group'),
|
||||
spaceSvc: service('folder'),
|
||||
userSvc: service('user'),
|
||||
router: service(),
|
||||
appMeta: service(),
|
||||
store: service(),
|
||||
spacePermissions: null,
|
||||
|
@ -26,6 +27,8 @@ export default Component.extend(ModalMixin, {
|
|||
searchText: '',
|
||||
|
||||
didReceiveAttrs() {
|
||||
this._super(...arguments);
|
||||
|
||||
let spacePermissions = A([]);
|
||||
let constants = this.get('constants');
|
||||
|
||||
|
@ -77,7 +80,6 @@ export default Component.extend(ModalMixin, {
|
|||
|
||||
permissionRecord(who, whoId, name) {
|
||||
let raw = {
|
||||
id: whoId,
|
||||
orgId: this.get('folder.orgId'),
|
||||
folderId: this.get('folder.id'),
|
||||
whoId: whoId,
|
||||
|
@ -161,6 +163,7 @@ export default Component.extend(ModalMixin, {
|
|||
|
||||
this.get('spaceSvc').savePermissions(folder.get('id'), payload).then(() => {
|
||||
this.modalClose('#space-permission-modal');
|
||||
this.get('onRefresh')();
|
||||
});
|
||||
},
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue