Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-04 21:15:24 +02:00
Code Releases Activity

restrict user lists based on account.users permission

Browse source
This commit is contained in:
Harvey Kandola 2017-09-22 10:22:52 +01:00
parent b56d3426d2
commit 508ec00c6a
9 changed files with 37 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gui/app/components/folder/category-admin.js
View file

@ -59,7 +59,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, DropdownMixin
});
// get users that this space admin user can see
this.get('userService').getAll().then((users) => {
this.get('userService').getSpaceUsers(this.get('folder.id')).then((users) => {
// set up Everyone user
let u = {
orgId: this.get('folder.orgId'),

10
gui/app/components/folder/permission-admin.js
View file

@ -23,15 +23,13 @@ export default Ember.Component.extend(NotifierMixin, {
store: service(),
didReceiveAttrs() {
this.get('userService').getAll().then((users) => {
this.get('userService').getSpaceUsers(this.get('folder.id')).then((users) => {
this.set('users', users);
// set up users
let folderPermissions = [];
users.forEach((user) => {
let isActive = user.get('active');
let u = {
orgId: this.get('folder.orgId'),
folderId: this.get('folder.id'),
@ -48,10 +46,8 @@ export default Ember.Component.extend(NotifierMixin, {
documentTemplate: false
};
if (isActive) {
let data = this.get('store').normalize('space-permission', u)
folderPermissions.pushObject(this.get('store').push(data));
}
let data = this.get('store').normalize('space-permission', u)
folderPermissions.pushObject(this.get('store').push(data));
});
// set up Everyone user

4
gui/app/pods/folder/settings/template.hbs
View file

@ -9,8 +9,8 @@
{{#if isAuthProviderDocumize}}
{{#link-to 'folder.settings.invitation' activeClass='selected' class="option" tagName="li"}}Invite{{/link-to}}
{{/if}}
{{#link-to 'folder.settings.security' activeClass='selected' class="option" tagName="li"}}Secure{{/link-to}}
{{#link-to 'folder.settings.category' activeClass='selected' class="option" tagName="li"}}Categorize{{/link-to}}
{{#link-to 'folder.settings.security' activeClass='selected' class="option" tagName="li"}}Permissions{{/link-to}}
{{#link-to 'folder.settings.category' activeClass='selected' class="option" tagName="li"}}Categories{{/link-to}}
</ul>
</div>
</div>

6
gui/app/services/user.js
View file

@ -66,9 +66,9 @@ export default Ember.Service.extend({
});
},
// Returns all users that can see folder.
getFolderUsers(folderId) {
let url = `users/folder/${folderId}`;
// Returns all users that can see space.
getSpaceUsers(spaceId) {
let url = `users/space/${spaceId}`;
return this.get('ajax').request(url, {
method: "GET"