Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8cf7370cae | |||
| bf2a772566 | |||
| ddb7e645a0 |
@@ -189,6 +189,13 @@ function bindOrganisationButtons(el, options) {
|
||||
var options = {
|
||||
ajax: {
|
||||
url: site.uri.public + '/api/organisations',
|
||||
data: function (params) {
|
||||
return {
|
||||
filters: {
|
||||
info : params.term
|
||||
}
|
||||
};
|
||||
},
|
||||
processResults: function (data) {
|
||||
var items = data.rows.filter((i) => i.slug != organisation_slug);
|
||||
return {
|
||||
|
||||
@@ -255,7 +255,7 @@ class OrganisationController extends SimpleController
|
||||
// Check if name or slug already exists
|
||||
if (
|
||||
isset($data['name']) &&
|
||||
$data['name'] != $organisation->name &&
|
||||
strtolower($data['name']) != strtolower($organisation->name) &&
|
||||
$classMapper->getClassMapping('organisation')::findUnique($data['name'], 'name')
|
||||
) {
|
||||
$ms->addMessageTranslated('danger', 'ORGANISATION.NAME.IN_USE', $data);
|
||||
|
||||
@@ -311,6 +311,14 @@ class OrganisationPermissions extends BaseSeed
|
||||
]);
|
||||
}
|
||||
|
||||
$roleUserAdmin = Role::where('slug', 'user-admin')->first();
|
||||
if ($roleSiteAdmin) {
|
||||
$roleSiteAdmin->permissions()->syncWithoutDetaching([
|
||||
$permissions['view_user_field']->id,
|
||||
$permissions['update_user_field']->id,
|
||||
]);
|
||||
}
|
||||
|
||||
$roleGroupAdmin = Role::where('slug', 'group-admin')->first();
|
||||
if ($roleGroupAdmin) {
|
||||
$roleGroupAdmin->permissions()->sync([
|
||||
|
||||
Reference in New Issue
Block a user