3 Commits
v1.0 ... v1.0.3

3 changed files with 16 additions and 1 deletions

View File

@@ -189,6 +189,13 @@ function bindOrganisationButtons(el, options) {
var options = { var options = {
ajax: { ajax: {
url: site.uri.public + '/api/organisations', url: site.uri.public + '/api/organisations',
data: function (params) {
return {
filters: {
info : params.term
}
};
},
processResults: function (data) { processResults: function (data) {
var items = data.rows.filter((i) => i.slug != organisation_slug); var items = data.rows.filter((i) => i.slug != organisation_slug);
return { return {

View File

@@ -255,7 +255,7 @@ class OrganisationController extends SimpleController
// Check if name or slug already exists // Check if name or slug already exists
if ( if (
isset($data['name']) && isset($data['name']) &&
$data['name'] != $organisation->name && strtolower($data['name']) != strtolower($organisation->name) &&
$classMapper->getClassMapping('organisation')::findUnique($data['name'], 'name') $classMapper->getClassMapping('organisation')::findUnique($data['name'], 'name')
) { ) {
$ms->addMessageTranslated('danger', 'ORGANISATION.NAME.IN_USE', $data); $ms->addMessageTranslated('danger', 'ORGANISATION.NAME.IN_USE', $data);

View File

@@ -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(); $roleGroupAdmin = Role::where('slug', 'group-admin')->first();
if ($roleGroupAdmin) { if ($roleGroupAdmin) {
$roleGroupAdmin->permissions()->sync([ $roleGroupAdmin->permissions()->sync([