Attachment 154890 Details for Bug 34631 – Bug 34631: Independentbranches - Non-superuser should not be able to write Additional contents for other branches

[patch] Bug 34631: Independentbranches - Non-superuser should not be able to write Additional contents for other branches

Bug-34631-Independentbranches---Non-superuser-shou.patch (text/plain), 5.86 KB, created by Hammat wele on 2023-08-28 17:23:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hammat wele

Created: 2023-08-28 17:23:00 UTC

Size: 5.86 KB

patch

obsolete

>From 66e581d295bbd83eb21ded6d1bb94d33e94708bb Mon Sep 17 00:00:00 2001
>From: Hammat Wele <hammat.wele@inlibro.com>
>Date: Mon, 28 Aug 2023 17:21:44 +0000
>Subject: [PATCH] Bug 34631: Independentbranches - Non-superuser should not be
> able to write Additional contents for other branches
>
>When syspref Independentbranches is enabled Non-superuser should not be able to write Additional contents for other branches
>
>To reproduce:
>1- Connect to staff interface as superlibrarian
>2- Enable IndependentBranches preference
>3- Go to Tools -> HTML customizations
>4- Crete an additional content for all libraries
>5- Create or edit a borrower
>    5-1- Set permission for the borrower
>        - catalogue
>        - edit_additional_contents
>4- Log in to the staff interface with the non-superlibrarian staff user
>5- Go to Tools -> HTML customizations
>    --> you can delete or edit the additional contents created by superlibrarian for All libraries
>6- Click on New entry
>    --> you can add additional content for other branches
>7- Apply the patch
>8- Repeat step 5
>    --> you cannot delete or edit the additional contents create by superlibrarian for All libraries
>9- Repeat step 6
>    --> you cannot add additional content for other branches
>10- submit the form
>    --> the branch of the created additional content is the current user branch
>---
> .../prog/en/modules/tools/additional-contents.tt          | 6 ++++++
> tools/additional-contents.pl                              | 8 ++++++--
> 2 files changed, 12 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>index 650ee9de53..005b89b6e0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt
>@@ -216,6 +216,7 @@
>                         [% PROCESS locations_options location => additional_content.location %]
>                     </select>
>                 </li>
>+                [% UNLESS my_branch %]
>                 <li>
>                     <label for="branchcode">Library: </label>
>                     <select id="branchcode" name="branchcode">
>@@ -227,6 +228,7 @@
>                         [% PROCESS options_for_libraries libraries => Branches.all( selected => additional_content.branchcode, unfiltered => 1, ) %]
>                     </select>
>                 </li>
>+                [% END %]
>                 [% UNLESS languages.size %]
>                     <li>
>                         [% IF category == 'news' %]
>@@ -366,7 +368,9 @@
>                         [% FOREACH c IN additional_contents%]
>                             [% IF ( c.is_expired ) %]<tr class="expired">[% ELSE %]<tr>[% END %]
>                             <td>
>+                            [% UNLESS ( my_branch && my_branch != c.branchcode ) %]
>                                 <input type="checkbox" name="ids" value="[% c.idnew | html %]" />
>+                            [% END %]
>                             </td>
>                             <td>
>                                 [% IF c.category == 'news' || c.category == 'pages' %]
>@@ -428,6 +432,7 @@
>                                 </div>
>                             </td>
>                             <td class="actions">
>+                            [% UNLESS ( my_branch && my_branch != c.branchcode ) %]
>                                 <div class="btn-group dropup">
>                                     <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&amp;id=[% c.idnew | uri %]&editmode=[% editmode | uri %]" class="btn btn-default btn-xs"> <i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a><button class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
>                                         <span class="caret"></span>
>@@ -445,6 +450,7 @@
>                                 <div class="btn-group">
>                                     <a href="#" class="delete_news btn btn-default btn-xs" data-idnew="[% c.idnew | html %]"><i class="fa fa-trash-can"></i> Delete</a>
>                                 </div>
>+                            [% END %]
>                             </td>
>                         </tr>
>                         [% END %]
>diff --git a/tools/additional-contents.pl b/tools/additional-contents.pl
>index e066bb8fee..0bb1e9874e 100755
>--- a/tools/additional-contents.pl
>+++ b/tools/additional-contents.pl
>@@ -61,6 +61,9 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
> );
> 
> my @messages;
>+my $my_branch = C4::Context->preference("IndependentBranches") && !C4::Context->IsSuperLibrarian()
>+    ?  C4::Context->userenv()->{'branch'}
>+    : undef;
> if ( $op eq 'add_form' ) {
> 
>     my $additional_content = Koha::AdditionalContents->find($id);
>@@ -79,6 +82,7 @@ if ( $op eq 'add_form' ) {
>         $category = $additional_content->category;
>     }
>     $template->param(
>+        my_branch => $my_branch,
>         additional_content => $additional_content,
>         translated_contents => $translated_contents,
>     );
>@@ -87,7 +91,7 @@ elsif ( $op eq 'add_validate' ) {
>     output_and_exit_if_error($cgi, $cookie, $template, { check => 'csrf_token' });
>     my $location   = $cgi->param('location');
>     my $code       = $cgi->param('code');
>-    my $branchcode = $cgi->param('branchcode') || undef;
>+    my $branchcode = $my_branch ? $my_branch : $cgi->param('branchcode') || undef;
>     my $idnew      = $cgi->param('idnew');
> 
>     my @lang       = $cgi->multi_param('lang');
>@@ -235,7 +239,7 @@ if ( $op eq 'list' ) {
>         { category => $category, lang => 'default' },
>         { order_by => { -desc => 'published_on' } }
>     );
>-    $template->param( additional_contents => $additional_contents );
>+    $template->param( additional_contents => $additional_contents, my_branch => $my_branch );
> }
> 
> my $translated_languages = C4::Languages::getTranslatedLanguages;
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 34631: 154889 | 154890 | 162787 | 162788 | 162856 | 162929 | 162972 | 162995 | 172231