diff --git a/README.md b/README.md index f597902..7bb62f6 100644 --- a/README.md +++ b/README.md @@ -21,4 +21,3 @@ Checkout our presentation: https://md.kabi.tk/p/H1nWPbueL ## How to contribute * You can contribute by signing pull requests and issues or programming! * Get in contact (Matrix: #errms@matrix.anghenfil.de) and check our website errms.dev and our project management tool: pm.errms.dev -* \ No newline at end of file diff --git a/migrations/2020-05-12-003758_create_roles_permissions/up.sql b/migrations/2020-05-12-003758_create_roles_permissions/up.sql index e3d763d..604e8f0 100644 --- a/migrations/2020-05-12-003758_create_roles_permissions/up.sql +++ b/migrations/2020-05-12-003758_create_roles_permissions/up.sql @@ -1,14 +1,15 @@ -- Your SQL goes here create table roles_permissions ( - role_id text not null + role_id text not null constraint roles_permissions_roles_id_fk references roles on update cascade on delete cascade, - permission_id text not null + permission_id text not null constraint roles_permissions_permissions_permission_fk references permissions on update cascade on delete cascade, - constraint roles_permissions_pk - primary key (role_id, permission_id) -); \ No newline at end of file + role_permission_id uuid default uuid_generate_v1() not null + constraint roles_permissions_pk_2 + primary key +); diff --git a/migrations/2020-08-12-222219_create_groups/down.sql b/migrations/2020-08-12-222219_create_groups/down.sql new file mode 100644 index 0000000..8f346b6 --- /dev/null +++ b/migrations/2020-08-12-222219_create_groups/down.sql @@ -0,0 +1,2 @@ +-- This file should undo anything in `up.sql` +drop table groups; \ No newline at end of file diff --git a/migrations/2020-08-12-222219_create_groups/up.sql b/migrations/2020-08-12-222219_create_groups/up.sql new file mode 100644 index 0000000..1c0609b --- /dev/null +++ b/migrations/2020-08-12-222219_create_groups/up.sql @@ -0,0 +1,15 @@ +-- Your SQL goes here +create table groups +( + entity_id uuid default uuid_generate_v1() not null + constraint groups_pk + primary key + constraint groups_entities_entity_id_fk + references entities + on update cascade on delete cascade, + group_name text not null, + group_description text +); + +create unique index groups_group_name_uindex + on groups (group_name); diff --git a/migrations/2020-08-12-222742_create_groups_entities/down.sql b/migrations/2020-08-12-222742_create_groups_entities/down.sql new file mode 100644 index 0000000..fd6b83b --- /dev/null +++ b/migrations/2020-08-12-222742_create_groups_entities/down.sql @@ -0,0 +1,2 @@ +-- This file should undo anything in `up.sql` +drop table groups_entities; \ No newline at end of file diff --git a/migrations/2020-08-12-222742_create_groups_entities/up.sql b/migrations/2020-08-12-222742_create_groups_entities/up.sql new file mode 100644 index 0000000..c126642 --- /dev/null +++ b/migrations/2020-08-12-222742_create_groups_entities/up.sql @@ -0,0 +1,14 @@ +-- Your SQL goes here +create table groups_entities +( + group_id uuid not null + constraint groups_entities_groups_group_id_fk + references groups + on update cascade on delete cascade, + entity_id uuid not null + constraint groups_entities_entities_entity_id_fk + references entities + on update cascade on delete cascade, + constraint groups_entities_pk + primary key (group_id, entity_id) +); \ No newline at end of file diff --git a/migrations/2020-08-22-212606_create_roles_permissions_context/down.sql b/migrations/2020-08-22-212606_create_roles_permissions_context/down.sql new file mode 100644 index 0000000..f020e64 --- /dev/null +++ b/migrations/2020-08-22-212606_create_roles_permissions_context/down.sql @@ -0,0 +1,2 @@ +-- This file should undo anything in `up.sql` +drop table roles_permissions_context; \ No newline at end of file diff --git a/migrations/2020-08-22-212606_create_roles_permissions_context/up.sql b/migrations/2020-08-22-212606_create_roles_permissions_context/up.sql new file mode 100644 index 0000000..9757c24 --- /dev/null +++ b/migrations/2020-08-22-212606_create_roles_permissions_context/up.sql @@ -0,0 +1,14 @@ +-- Your SQL goes here +create table roles_permissions_context +( + role_permission_id uuid + constraint roles_permissions_contexts_roles_permissions_role_permission_id + references roles_permissions + on update cascade on delete cascade, + entity uuid + constraint roles_permissions_contexts_entities_entity_id_fk + references entities + on update cascade on delete cascade, + constraint roles_permissions_context_pk + primary key (role_permission_id, entity) +); diff --git a/resources/css/errms.css b/resources/css/errms.css index cb56e67..0cef711 100644 --- a/resources/css/errms.css +++ b/resources/css/errms.css @@ -96,3 +96,7 @@ ul ul a { .sidebar_entry_active{ text-decoration: underline; } +.group_selection_group{ + display: inline; + +} \ No newline at end of file diff --git a/resources/templates/module_member_management_selection.hbs b/resources/templates/module_member_management_selection.hbs index 9e3eafb..232ad3d 100644 --- a/resources/templates/module_member_management_selection.hbs +++ b/resources/templates/module_member_management_selection.hbs @@ -17,9 +17,14 @@