Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Include admin group in list of all groups #2348

Merged
merged 1 commit into from
May 1, 2023
Merged

fix: Include admin group in list of all groups #2348

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 4 additions & 6 deletions src/settings/Api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export interface Folder {
}

export class Api {

getUrl(endpoint: string): string {
return OC.generateUrl(`apps/groupfolders/${endpoint}`);
}
Expand All @@ -45,14 +46,11 @@ export class Api {
return $.getJSON(this.getUrl('folders'))
.then((data: OCSResult<Folder[]>) => Object.keys(data.ocs.data).map(id => data.ocs.data[id]));
}

// Returns all NC groups
listGroups(): Thenable<Group[]> {
return $.getJSON(this.getUrl('delegation/groups'))
.then((data: OCSResult<Group[]>) => {
// No need to present the admin group as it is automaticaly added
const groups = data.ocs.data.filter(g => g.gid !== 'admin')
return groups
});
.then((data: OCSResult<Group[]>) => data.ocs.data)
}

// Returns all groups that have been granted delegated admin or subadmin rights on groupfolders
Expand All @@ -69,7 +67,7 @@ export class Api {
updateDelegatedGroups(newGroups: Group[], classname: string): Thenable<void> {
return axios.post(generateUrl('/apps/settings/') + '/settings/authorizedgroups/saveSettings', {
newGroups,
class: classname
class: classname,
})
.then((data) => data.data)
}
Expand Down