manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

✨ (user): Ordena alfabéticamente grupos de permisos

Browse source 
Añade `Lc::collation_key()` en PageTop para obtener una clave de
ordenación no sensible a mayúsculas y acentos, con `ñ` como letra propia
entre `n` y `o` en español.
This commit is contained in:
Manuel Cillero 2026-09-27 13:12:57 +02:00
parent 93cd3ba6c5
commit dbdaeb6151
7 changed files with 144 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
extensions/pagetop-user/src/handlers/admin/permissions.rs
View file

@ -14,11 +14,13 @@ use crate::permission::{self, UserPermission};
pub(crate) async fn list_get(request: HttpRequest) -> Result<Response, ErrorPage> {
require_permission(&request, &UserPermission::AdminPermissions)?;
let mut page = Page::admin(request);
let registry = permission::registry();
let title = Lc::t("title-admin-permissions", &LOCALES_USER);
let mut content = frame(title.clone());
for (group, group_label) in registry.groups() {
for (group, group_label) in registry.groups_sorted(page.context()) {
let items: Vec<(CowStr, Lc)> = registry
.by_group(group)
.map(|permission| (permission.key(), permission.label()))
@ -41,6 +43,10 @@ pub(crate) async fn list_get(request: HttpRequest) -> Result<Response, ErrorPage
));
}
let mut page = Page::admin(request).with_title(title).with_child(content);
Ok(page.render().await.into_response())
Ok(page
.with_title(title)
.with_child(content)
.render()
.await
.into_response())
}

21
extensions/pagetop-user/src/handlers/admin/roles.rs
View file

@ -157,7 +157,7 @@ pub(crate) async fn new_post(
}
}
// **< edit_get / edit_post >************************************************************************
// **< edit_get / edit_post >***********************************************************************
/// GET /admin/user/roles/{id}/edit - Formulario de edición de rol.
pub(crate) async fn edit_get(
@ -286,9 +286,9 @@ pub(crate) async fn view_get(
Ok(keys) => keys,
Err(_) => return Err(ErrorPage::InternalError(Some(request))),
};
let groups = build_permission_groups(&selected);
let mut page = Page::admin(request);
let groups = build_permission_groups(&selected, page.context());
let back_href = waypoint.or(page.context().route(ADMIN_ROLES_PATH));
let details_block = role_view_details(&role, page.context()).await;
@ -469,13 +469,13 @@ pub(crate) async fn delete_confirm_get(
Ok(HtmxResponse::new(button.render(&mut cx).await).into_response())
}
// **< permissions_get / permissions_post >**********************************************************
// **< permissions_get / permissions_post >*********************************************************
fn build_permission_groups(selected: &[String]) -> PermissionGroups {
fn build_permission_groups(selected: &[String], cx: &Context) -> PermissionGroups {
let registry = permission::registry();
registry
.groups()
.iter()
.groups_sorted(cx)
.into_iter()
.map(|(group, group_label)| {
let perms = registry
.by_group(group)
@ -507,9 +507,9 @@ pub(crate) async fn permissions_get(
Ok(keys) => keys,
Err(_) => return Err(ErrorPage::InternalError(Some(request))),
};
let groups = build_permission_groups(&selected);
let mut page = Page::admin(request);
let groups = build_permission_groups(&selected, page.context());
let back_href = waypoint.or(page.context().route(ADMIN_ROLES_PATH));
let title = Lc::t("title-admin-role-permissions", &LOCALES_USER);
@ -560,8 +560,9 @@ pub(crate) async fn permissions_post(
Ok(Redirect::see_other(target).into_response())
}
Err(err) => {
let groups = build_permission_groups(&form.permission_keys);
let mut page = Page::admin(request);
let groups = build_permission_groups(&form.permission_keys, page.context());
let back_href = waypoint.or(page.context().route(ADMIN_ROLES_PATH));
let form_component = RolePermissionsForm::new()
.with_role_id(id)