Attachment 157720 Details for Bug 23111 – Bug 23111: (follow-up) Add a column to show default framework

[patch] Bug 23111: (follow-up) Add a column to show default framework

Bug-23111-follow-up-Add-a-column-to-show-default-f.patch (text/plain), 3.32 KB, created by Aleisha Amohia on 2023-10-24 02:44:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2023-10-24 02:44:05 UTC

Size: 3.32 KB

patch

obsolete

>From 03243c129333501fb783b655096b6579a05ff29e Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Sat, 24 Oct 2020 14:56:13 +1300
>Subject: [PATCH] Bug 23111: (follow-up) Add a column to show default framework
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> admin/biblio_framework.pl                      | 18 ++++++++++++++----
> .../prog/en/modules/admin/biblio_framework.tt  |  4 ++++
> 2 files changed, 18 insertions(+), 4 deletions(-)
>
>diff --git a/admin/biblio_framework.pl b/admin/biblio_framework.pl
>index 212eb3da5e4..78da7e934bc 100755
>--- a/admin/biblio_framework.pl
>+++ b/admin/biblio_framework.pl
>@@ -118,13 +118,23 @@ if ( $op eq 'add_form' ) {
> }
> 
> if ( $op eq 'list' ) {
>-    my $frameworks = Koha::BiblioFrameworks->search( {}, { order_by => ['frameworktext'], } );
>-    $template->param( frameworks => $frameworks, );
>+    my $frameworks        = Koha::BiblioFrameworks->search( {}, { order_by => ['frameworktext'], } );
>+    my $default_framework = Koha::BiblioFrameworks->get_default;
>+    $template->param(
>+        frameworks        => $frameworks,
>+        default_framework => ( $default_framework && $default_framework->frameworkcode ne '' )
>+        ? $default_framework->frameworkcode
>+        : '',
>+    );
> }
> 
>+my $default_framework = Koha::BiblioFrameworks->get_default;
> $template->param(
>-    messages => \@messages,
>-    op       => $op,
>+    messages          => \@messages,
>+    op                => $op,
>+    default_framework => ( $default_framework && $default_framework->frameworkcode ne '' )
>+    ? $default_framework->frameworkcode
>+    : '',
> );
> 
> output_html_with_http_headers $input, $cookie, $template->output;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>index b2b13a9e32f..52ad7b35097 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
>@@ -142,6 +142,7 @@
>                     [% ELSE %]
>                         <input type="checkbox" name="is_default" id="is_default" value="1">
>                     [% END %]
>+                    <span class="hint">Unset to revert default framework to Default</span>
>                 </li>
>             </ol>
>         </fieldset>
>@@ -182,6 +183,7 @@
>     <tr>
>         <th>Code</th>
>         <th>Description</th>
>+        <th class="is_default">Is default?</th>
>         <th>&nbsp;</th>
>     </tr>
>     </thead>
>@@ -189,6 +191,7 @@
>     <tr>
>         <td>&nbsp;</td>
>         <td>Default framework</td>
>+        <td class="is_default">[% IF default_framework == '' %]Yes[% ELSE %]No[% END %]</td>
>         <td>
>           <div class="btn-group dropup">
>             <a class="btn btn-default btn-xs dropdown-toggle" id="frameworkactions[% loo.frameworkcode | html %]" role="button" data-toggle="dropdown" href="#">
>@@ -257,6 +260,7 @@
>         <tr>
>             <td>[% loo.frameworkcode | html %]</td>
>             <td>[% loo.frameworktext | html %]</td>
>+            <td class="is_default">[% IF loo.is_default %]Yes[% ELSE %]No[% END %]</td>
>             <td>
>               <div class="btn-group dropup">
>                 <a class="btn btn-default btn-xs dropdown-toggle" id="frameworkactions[% loo.frameworkcode | html %]" role="button" data-toggle="dropdown" href="#">
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 23111: 90550 | 90587 | 90588 | 91039 | 91040 | 91791 | 92184 | 102602 | 102603 | 104058 | 104059 | 104060 | 104061 | 104062 | 106560 | 112354 | 112468 | 138766 | 138767 | 138768 | 138769 | 138770 | 141565 | 141566 | 141567 | 141568 | 141569 | 157717 | 157718 | 157719 | 157720 | 157721 | 157722 | 157723