From f4f5d0d2f724fe58ebbcd32cfc9781c78f041951 Mon Sep 17 00:00:00 2001 From: Alex Buckley Date: Wed, 24 Aug 2022 01:01:33 +0000 Subject: [PATCH] Bug 30418: Re-order options of who can edit list contents The 'Allow changes to contents from' dropdown when creating/edit lists should be most locked down to least locked down: 1. Nobody 2. Owner only 3. Permitted staff only 4. Staff only 5. Anyone seeing this list Sponsored-by: Catalyst IT, New Zealand Signed-off-by: Kyle M Hall Signed-off-by: Lucas Gass Signed-off-by: Tomas Cohen Arazi --- .../prog/en/modules/virtualshelves/shelves.tt | 17 ++++++++--------- .../bootstrap/en/modules/opac-shelves.tt | 10 ++++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index d9fa631724..adef582af4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -37,28 +37,27 @@ [% END %] - [% IF shelf.allow_change_from_others %] - + [% IF shelf.allow_change_from_permitted_staff %] + [% ELSE %] - + [% END %] - [% IF shelf.allow_change_from_staff %] [% ELSE %] [% END %] - [% IF shelf.allow_change_from_permitted_staff %] - + [% IF shelf.allow_change_from_others %] + [% ELSE %] - + [% END %] -   -   +   +   [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index 79d86f74b8..5c8a8fe695 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -48,15 +48,17 @@ [% END %] - [% IF shelf.allow_change_from_others %][% ELSE %][% END %] + [% IF permitteduser == 1 %][% IF shelf.allow_change_from_permitted_staff %][% ELSE %][% END %][% END %] [% IF staffuser == 1 %][% IF shelf.allow_change_from_staff %][% ELSE %][% END %][% END %] - [% IF permitteduser == 1 %][% IF shelf.allow_change_from_permitted_staff %][% ELSE %][% END %][% END %] + + [% IF shelf.allow_change_from_others %][% ELSE %][% END %] + -   +   -   +   [% END %] -- 2.39.5