feat: Add Admin Groups Management Module
- Introduced a new module for managing user groups (`usrgrp`) in the administration interface. - Implemented CRUD operations for user groups: list, create, rename, and delete. - Added authorization checks to ensure only users with appropriate permissions can manage groups. - Created corresponding frontend JavaScript and SCSS files for the new module. - Updated documentation to reflect the new group management functionality and its authorization model. - Added SQL stored procedures for group management operations. - Established a new login script for database access, ensuring proper security practices.
This commit is contained in:
@@ -30,6 +30,40 @@ let $usr = {
|
||||
let f = (firstname || '').trim().charAt(0), n = (name || '').trim().charAt(0);
|
||||
return (f + n).toUpperCase() || '?';
|
||||
},
|
||||
/* Builds one (detached) grid row for a user record; shared by renderLst and refreshRow. */
|
||||
buildRow: function (rw) {
|
||||
let disabled = bool(rw.disabled, false) === true;
|
||||
let row = $$.dc('usr_row', { id: 'usr' + rw.useraccount_id });
|
||||
$$.dc('usr_avatar', row).text($usr.initials(rw.firstname, rw.name));
|
||||
$$.dc('usr_col_name', row).text(`${rw.firstname || ''} ${rw.name || ''}`.trim());
|
||||
$$.dc('usr_col_email', row).text(rw.email || '');
|
||||
$$.dc('usr_col_groups', row).text(rw.groups || '').attr('title', rw.groups || '');
|
||||
$$.dc('usr_col_status', row).append(
|
||||
$$.dc(disabled ? 'usr_pill usr_pill_off' : 'usr_pill usr_pill_on').text(disabled ? $uct.disabled : $uct.active)
|
||||
);
|
||||
row.click(function () {
|
||||
row.toggleClass('selected').siblings().rC('selected');
|
||||
if (row.is('.selected') === true) { $usr.iMn(rw); } else { $usr.eM(true); }
|
||||
});
|
||||
return row;
|
||||
},
|
||||
/* Re-fetches a single user and swaps its grid row in place, keeping selection + ribbon
|
||||
(used after changes that only affect that one row: email, group membership). Falls back
|
||||
to a full reload when the row is no longer in the grid. */
|
||||
refreshRow: function (rw) {
|
||||
let old = $('#usr' + rw.useraccount_id);
|
||||
if (old.length === 0) { $usr.renderLst(); return; }
|
||||
$ocms.postXT({
|
||||
url: $ocms.url('usr/list'), data: { useraccount_id: rw.useraccount_id }, success: function (r) {
|
||||
let fresh = (r.users || [])[0];
|
||||
if (!fresh) { $usr.renderLst(); return; }
|
||||
let selected = old.is('.selected');
|
||||
let row = $usr.buildRow(fresh).toggleClass('selected', selected);
|
||||
old.replaceWith(row);
|
||||
if (selected) { $usr.iMn(fresh); }
|
||||
}, error: function () { $usr.renderLst(); }
|
||||
});
|
||||
},
|
||||
renderLst: function () {
|
||||
let usrlst = $fis.frm_list(true, true).ldng(1), usrfrm = $$.dc('usrfrm', usrlst);
|
||||
$usr.eM(true);
|
||||
@@ -41,25 +75,13 @@ let $usr = {
|
||||
$$.dc('usr_col_avatar', hdr);
|
||||
$$.dc('usr_col_name', hdr).text($uct.col_name);
|
||||
$$.dc('usr_col_email', hdr).text($uct.col_email);
|
||||
$$.dc('usr_col_groups', hdr).text($uct.col_groups);
|
||||
$$.dc('usr_col_status', hdr).text($uct.col_status);
|
||||
if ((r.users || []).length === 0) {
|
||||
$$.dc('usr_empty', grid).text($uct.empty);
|
||||
return;
|
||||
}
|
||||
$.each(r.users || [], function (ri, rw) {
|
||||
let disabled = bool(rw.disabled, false) === true;
|
||||
let row = $$.dc('usr_row', grid, { id: 'usr' + rw.useraccount_id });
|
||||
$$.dc('usr_avatar', row).text($usr.initials(rw.firstname, rw.name));
|
||||
$$.dc('usr_col_name', row).text(`${rw.firstname || ''} ${rw.name || ''}`.trim());
|
||||
$$.dc('usr_col_email', row).text(rw.email || '');
|
||||
$$.dc('usr_col_status', row).append(
|
||||
$$.dc(disabled ? 'usr_pill usr_pill_off' : 'usr_pill usr_pill_on').text(disabled ? $uct.disabled : $uct.active)
|
||||
);
|
||||
row.click(function () {
|
||||
row.toggleClass('selected').siblings().rC('selected');
|
||||
if (row.is('.selected') === true) { $usr.iMn(rw); } else { $usr.eM(true); }
|
||||
});
|
||||
});
|
||||
$.each(r.users || [], function (ri, rw) { grid.append($usr.buildRow(rw)); });
|
||||
}, error: function () {
|
||||
usrfrm.empty();
|
||||
$$.dc('usr_err', usrfrm).text($uct.loadfail);
|
||||
@@ -142,7 +164,7 @@ let $usr = {
|
||||
}, error: function (jqXHR) {
|
||||
let code = ((jqXHR || {}).responseJSON || {}).error;
|
||||
alert($uct.err[code] || $uct.err_generic);
|
||||
}, complete: function () { c.ldng(0); $usr.renderLst(); }
|
||||
}, complete: function () { c.ldng(0); $usr.refreshRow(rw); }
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -161,6 +183,7 @@ let $usr = {
|
||||
$ocms.postXT({
|
||||
url: $ocms.url('usr/groupset'),
|
||||
data: { useraccount_id: rw.useraccount_id, usergroup_id: g.usergroup_id, member: checked },
|
||||
success: function () { $usr.refreshRow(rw); }, /* keep the groups csv in the grid current per toggle */
|
||||
error: function () {
|
||||
cb.prop('checked', !checked);
|
||||
alert($uct.err_generic);
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
.usr_row {
|
||||
display: grid;
|
||||
grid-template-columns: 2.75rem 1.6fr 1.8fr 8rem;
|
||||
grid-template-columns: 2.75rem 1.4fr 1.6fr 1.6fr 8rem;
|
||||
align-items: center;
|
||||
gap: 0.75rem;
|
||||
padding: 0.55rem 1rem;
|
||||
@@ -57,6 +57,8 @@
|
||||
|
||||
.usr_col_name { font-weight: 600; color: #222; }
|
||||
.usr_col_email { color: #555; overflow-wrap: anywhere; }
|
||||
.usr_col_groups { color: #555; font-size: 0.9rem; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.usr_row_hd .usr_col_groups { font-size: inherit; }
|
||||
|
||||
.usr_pill {
|
||||
display: inline-block;
|
||||
@@ -86,11 +88,12 @@
|
||||
.usrfrm {
|
||||
padding: 0.75rem;
|
||||
|
||||
.usr_row { grid-template-columns: 2.25rem 1fr; grid-template-areas: "avatar name" "avatar email" "avatar status"; }
|
||||
.usr_row { grid-template-columns: 2.25rem 1fr; grid-template-areas: "avatar name" "avatar email" "avatar groups" "avatar status"; }
|
||||
.usr_row_hd { display: none; }
|
||||
.usr_avatar { grid-area: avatar; }
|
||||
.usr_col_name { grid-area: name; }
|
||||
.usr_col_email { grid-area: email; font-size: 0.85rem; }
|
||||
.usr_col_groups { grid-area: groups; font-size: 0.85rem; white-space: normal; }
|
||||
.usr_col_status { grid-area: status; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ let $uct = {
|
||||
, rel: 'Neu Laden'
|
||||
, col_name: 'Name'
|
||||
, col_email: 'E-Mail'
|
||||
, col_groups: 'Gruppen'
|
||||
, col_status: 'Status'
|
||||
, active: 'Aktiv'
|
||||
, disabled: 'Deaktiviert'
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
let $ugp = {
|
||||
init2: function () {
|
||||
$ocms.getScript([], function () { $ugp.init3(); });
|
||||
},
|
||||
init3: function () {
|
||||
$fis.cf(true);
|
||||
$fis.lf(true);
|
||||
$('#activemodule').text($ugt.mdl);
|
||||
$ugp.eM();
|
||||
$ugp.renderLst();
|
||||
},
|
||||
/* Default ribbon (nothing selected). */
|
||||
eM: function (r) {
|
||||
let m = [{ lbl: $ugt.newgroup_btn, fnc: $ugp.createDlg }];
|
||||
if (bool(r, false) === true) { m.push({ lbl: $ugt.rel, fnc: $ugp.renderLst }); }
|
||||
return $('#topbar').ocmsmenu(m);
|
||||
},
|
||||
/* Per-row ribbon shown while a group row is selected. */
|
||||
iMn: function (rw) {
|
||||
return $('#topbar').ocmsmenu([
|
||||
{ lbl: $ugt.rename, fnc: function () { $ugp.renameDlg(rw); } },
|
||||
{ lbl: $ugt.delete, fnc: function () { $ugp.deleteGroup(rw); } }
|
||||
]);
|
||||
},
|
||||
renderLst: function () {
|
||||
let ugplst = $fis.frm_list(true, true).ldng(1), ugpfrm = $$.dc('ugpfrm', ugplst);
|
||||
$ugp.eM(true);
|
||||
$ocms.postXT({
|
||||
url: $ocms.url('usrgrp/list'), success: function (r) {
|
||||
ugpfrm.empty();
|
||||
let grid = $$.dc('ugp_grid', ugpfrm);
|
||||
let hdr = $$.dc('ugp_row ugp_row_hd', grid);
|
||||
$$.dc('ugp_col_name', hdr).text($ugt.col_name);
|
||||
if ((r.groups || []).length === 0) {
|
||||
$$.dc('ugp_empty', grid).text($ugt.empty);
|
||||
return;
|
||||
}
|
||||
$.each(r.groups || [], function (gi, rw) {
|
||||
let row = $$.dc('ugp_row', grid, { id: 'ugp' + rw.usergroup_id });
|
||||
$$.dc('ugp_col_name', row).text(rw.name || '');
|
||||
row.click(function () {
|
||||
row.toggleClass('selected').siblings().rC('selected');
|
||||
if (row.is('.selected') === true) { $ugp.iMn(rw); } else { $ugp.eM(true); }
|
||||
});
|
||||
});
|
||||
}, error: function () {
|
||||
ugpfrm.empty();
|
||||
$$.dc('ugp_err', ugpfrm).text($ugt.loadfail);
|
||||
}, complete: function () { ugplst.ldng(0); }
|
||||
});
|
||||
},
|
||||
createDlg: function () {
|
||||
$ocms.dlgform([
|
||||
{ name: 'name', label: $ugt.name_field, type: 'string', required: true }
|
||||
], {
|
||||
title: $ugt.newgroup,
|
||||
button: $ugt.newgroup_btn,
|
||||
submit: function (e) {
|
||||
let c = $(this).ldng(1);
|
||||
let qs = c.serializeObject(true, { typedvalues: true });
|
||||
$ocms.postXT({
|
||||
url: $ocms.url('usrgrp/create'), data: qs, success: function () {
|
||||
c.trigger('modal_close');
|
||||
}, error: function (jqXHR) {
|
||||
let code = ((jqXHR || {}).responseJSON || {}).error;
|
||||
alert($ugt.err[code] || $ugt.err_generic);
|
||||
}, complete: function () { c.ldng(0); $ugp.renderLst(); }
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
renameDlg: function (rw) {
|
||||
$ocms.dlgform([
|
||||
{ name: 'usergroup_id', type: 'hidden', value: rw.usergroup_id },
|
||||
{ name: 'name', label: $ugt.name_field, type: 'string', required: true, value: rw.name }
|
||||
], {
|
||||
title: $ugt.rename,
|
||||
button: $ugt.rename_btn,
|
||||
submit: function (e) {
|
||||
let c = $(this).ldng(1);
|
||||
let qs = c.serializeObject(true, { typedvalues: true });
|
||||
$ocms.postXT({
|
||||
url: $ocms.url('usrgrp/rename'), data: qs, success: function () {
|
||||
c.trigger('modal_close');
|
||||
}, error: function (jqXHR) {
|
||||
let code = ((jqXHR || {}).responseJSON || {}).error;
|
||||
alert($ugt.err[code] || $ugt.err_generic);
|
||||
}, complete: function () { c.ldng(0); $ugp.renderLst(); }
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
deleteGroup: function (rw) {
|
||||
if (confirm(string($ugt.delete_confirm, [rw.name || '']))) {
|
||||
$ocms.postXT({
|
||||
url: $ocms.url('usrgrp/delete'), data: { usergroup_id: rw.usergroup_id }, success: function () {
|
||||
$ugp.eM(true);
|
||||
}, error: function (jqXHR) {
|
||||
let code = ((jqXHR || {}).responseJSON || {}).error;
|
||||
alert($ugt.err[code] || $ugt.err_generic);
|
||||
}, complete: function () { $ugp.renderLst(); }
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
let $$ugp = { init2: $ugp.init2, auth: {} };
|
||||
export default $$ugp;
|
||||
@@ -0,0 +1,58 @@
|
||||
.ugpfrm {
|
||||
padding: 1.5rem 2rem;
|
||||
|
||||
.ugp_grid {
|
||||
border: 1px solid #e2e2e2;
|
||||
border-radius: 0.5rem;
|
||||
background: #fff;
|
||||
box-shadow: 0 1px 3px rgba(50, 50, 50, 0.1);
|
||||
overflow: hidden;
|
||||
max-width: 32rem;
|
||||
}
|
||||
|
||||
.ugp_row {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr;
|
||||
align-items: center;
|
||||
padding: 0.55rem 1rem;
|
||||
border-bottom: 1px solid #eee;
|
||||
|
||||
&:last-child { border-bottom: none; }
|
||||
}
|
||||
|
||||
.ugp_row_hd {
|
||||
background: $fuchs_blau;
|
||||
color: #fff;
|
||||
font-weight: bold;
|
||||
font-size: 0.85rem;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 0.02em;
|
||||
padding: 0.5rem 1rem;
|
||||
}
|
||||
|
||||
.ugp_row:not(.ugp_row_hd) {
|
||||
cursor: pointer;
|
||||
transition: background-color 0.12s ease-in-out;
|
||||
|
||||
&:hover { background-color: #f3f6fb; }
|
||||
|
||||
&.selected {
|
||||
background-color: rgba($fuchs_akzent, 0.12);
|
||||
box-shadow: inset 3px 0 0 $fuchs_akzent;
|
||||
}
|
||||
}
|
||||
|
||||
.ugp_col_name { font-weight: 600; color: #222; }
|
||||
|
||||
.ugp_empty {
|
||||
padding: 1.5rem 1rem;
|
||||
text-align: center;
|
||||
color: #777;
|
||||
}
|
||||
|
||||
.ugp_err {
|
||||
padding: 1rem 2rem;
|
||||
color: #b00020;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
let $ugt = {
|
||||
mdl: 'Gruppenverwaltung'
|
||||
, rel: 'Neu Laden'
|
||||
, col_name: 'Name'
|
||||
, loadfail: 'Die Gruppenliste konnte nicht geladen werden.'
|
||||
, empty: 'Es sind keine Benutzergruppen vorhanden.'
|
||||
, newgroup: 'Neue Gruppe'
|
||||
, newgroup_btn: 'Anlegen'
|
||||
, name_field: 'Gruppenname'
|
||||
, rename: 'Gruppe umbenennen'
|
||||
, rename_btn: 'Speichern'
|
||||
, delete: 'Gruppe löschen'
|
||||
, delete_confirm: 'Soll die Gruppe "{0}" wirklich gelöscht werden? Die Mitgliedschaft aller Benutzer in dieser Gruppe geht dabei verloren.'
|
||||
, err: {
|
||||
save_failed: 'Die Gruppe konnte nicht gespeichert werden.',
|
||||
delete_failed: 'Die Gruppe konnte nicht gelöscht werden.'
|
||||
}
|
||||
, err_generic: 'Die Änderung konnte nicht gespeichert werden.'
|
||||
};
|
||||
Reference in New Issue
Block a user