Bugzilla – Attachment 185446 Details for
Bug 34631
Independentbranches - Non-superuser should not be able to write Additional contents for other branches
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34631: (follow-up) Tidy additional-contents.tt
Bug-34631-follow-up-Tidy-additional-contentstt.patch (text/plain), 7.35 KB, created by
Hammat wele
on 2025-08-15 12:49:42 UTC
(
hide
)
Description:
Bug 34631: (follow-up) Tidy additional-contents.tt
Filename:
MIME Type:
Creator:
Hammat wele
Created:
2025-08-15 12:49:42 UTC
Size:
7.35 KB
patch
obsolete
>From 1cf34d0c44b3f13ce09dbabcfb03ec5bbe7b972d Mon Sep 17 00:00:00 2001 >From: Hammat Wele <hammat.wele@inlibro.com> >Date: Thu, 14 Aug 2025 19:04:15 +0000 >Subject: [PATCH] Bug 34631: (follow-up) Tidy additional-contents.tt > >--- > .../en/modules/tools/additional-contents.tt | 70 ++++++++++--------- > 1 file changed, 36 insertions(+), 34 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 b4dac91fc43..8f0741f8b14 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 >@@ -235,17 +235,17 @@ > [% INCLUDE 'html-customization-help.inc' %] > </li> > [% UNLESS my_branch_as_staff %] >- <li> >- <label for="branchcode">Library: </label> >- <select id="branchcode" name="branchcode"> >- [% IF additional_content.branchcode == '' %] >- <option value="" selected="selected">All libraries</option> >- [% ELSE %] >- <option value="">All libraries</option> >- [% END %] >- [% PROCESS options_for_libraries libraries => Branches.all( selected => additional_content.branchcode, unfiltered => 1, ) %] >- </select> >- </li> >+ <li> >+ <label for="branchcode">Library: </label> >+ <select id="branchcode" name="branchcode"> >+ [% IF additional_content.branchcode == '' %] >+ <option value="" selected="selected">All libraries</option> >+ [% ELSE %] >+ <option value="">All libraries</option> >+ [% END %] >+ [% PROCESS options_for_libraries libraries => Branches.all( selected => additional_content.branchcode, unfiltered => 1, ) %] >+ </select> >+ </li> > [% END %] > [% UNLESS languages.size %] > <li> >@@ -402,9 +402,9 @@ > [% SET default_localization = c.default_localization %] > <tr [% IF c.is_expired %]class="expired"[% END %]> > <td> >- [% UNLESS ( my_branch_as_staff && my_branch_as_staff != c.branchcode ) %] >- <input type="checkbox" name="ids" value="[% c.id | html %]" /> >- [% END %] >+ [% UNLESS ( my_branch_as_staff && my_branch_as_staff != c.branchcode ) %] >+ <input type="checkbox" name="ids" value="[% c.id | html %]" /> >+ [% END %] > </td> > <td> > [% IF c.category == 'news' || c.category == 'pages' %] >@@ -468,26 +468,28 @@ > </div> > </td> > <td class="actions"> >- [% UNLESS ( my_branch_as_staff && my_branch_as_staff != c.branchcode ) %] >- <div class="btn-group dropup"> >- <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% c.id | uri %]&editmode=[% editmode | uri %]" class="btn btn-default btn-xs"> <i class="fa-solid fa-pencil"></i> Edit</a >- ><button class="btn btn-default btn-xs dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> </button> >- <ul class="dropdown-menu"> >- <li> >- [% IF ( wysiwyg ) %] >- <a class="dropdown-item" href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% c.id | uri %]&editmode=text"><i class="fa-solid fa-pencil"></i> Edit with text editor</a> >- [% ELSE %] >- <a class="dropdown-item" href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% c.id | uri %]&editmode=wysiwyg" >- ><i class="fa-solid fa-pencil"></i> Edit with WYSIWYG editor</a >- > >- [% END %] >- </li> >- </ul> >- </div> >- <div class="btn-group"> >- <a href="#" class="delete_news btn btn-default btn-xs" data-id="[% c.id | html %]"><i class="fa fa-trash-can"></i> Delete</a> >- </div> >- [% END %] >+ [% UNLESS ( my_branch_as_staff && my_branch_as_staff != c.branchcode ) %] >+ <div class="btn-group dropup"> >+ <a href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% c.id | uri %]&editmode=[% editmode | uri %]" class="btn btn-default btn-xs"> <i class="fa-solid fa-pencil"></i> Edit</a >+ ><button class="btn btn-default btn-xs dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false"> </button> >+ <ul class="dropdown-menu"> >+ <li> >+ [% IF ( wysiwyg ) %] >+ <a class="dropdown-item" href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% c.id | uri %]&editmode=text" >+ ><i class="fa-solid fa-pencil"></i> Edit with text editor</a >+ > >+ [% ELSE %] >+ <a class="dropdown-item" href="/cgi-bin/koha/tools/additional-contents.pl?op=add_form&id=[% c.id | uri %]&editmode=wysiwyg" >+ ><i class="fa-solid fa-pencil"></i> Edit with WYSIWYG editor</a >+ > >+ [% END %] >+ </li> >+ </ul> >+ </div> >+ <div class="btn-group"> >+ <a href="#" class="delete_news btn btn-default btn-xs" data-id="[% c.id | html %]"><i class="fa fa-trash-can"></i> Delete</a> >+ </div> >+ [% END %] > </td> > </tr> > [% END %] >-- >2.34.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 34631
:
154889
|
154890
|
162787
|
162788
|
162856
|
162929
|
162972
|
162995
|
172231
|
175973
|
175974
|
175975
|
175976
|
179859
|
179860
|
180602
|
180603
|
180604
|
184604
|
185420
|
185421
|
185422
|
185423
|
185424
|
185442
|
185443
|
185444
|
185445
| 185446