From b7dfea022efecb76bd413724be7d830df40e6bdb Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 9 Mar 2016 11:16:07 +0000 Subject: [PATCH] Bug 16012: Restore the ability to edit default authority type Bug 15380 introduced a regression on the authority types admin page: the default authority type (authtypecode="") is no longer editable. Test plan: Edit the authority type to update the summary => Without this patch you will get the "add a new authority type" form => With this patch applied, the correct behavior will be restored --- admin/authtypes.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/admin/authtypes.pl b/admin/authtypes.pl index 9f40827..7be61e0 100755 --- a/admin/authtypes.pl +++ b/admin/authtypes.pl @@ -44,7 +44,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( if ( $op eq 'add_form' ) { my $authority_type; - if ($authtypecode) { + if (defined $authtypecode) { $authority_type = Koha::Authority::Types->find($authtypecode); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt index e72cc60..4417808 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt @@ -1,7 +1,7 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Authority types [% IF op == 'add_form' %] -› [% IF authority_type.authtypecode %]Modify authority type[% ELSE %]New authority type[% END %] +› [% IF authority_type.authtypecode.defined %]Modify authority type[% ELSE %]New authority type[% END %] [% ELSIF op == 'delete_confirm' %] › Confirm deletion of authority type [% END %] @@ -32,7 +32,7 @@ › <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> › <a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a> [% IF op == 'add_form' %] -› [% IF authority_type.authtypecode %]Modify[% ELSE %]New[% END %] Authority type +› [% IF authority_type.authtypecode.defined %]Modify[% ELSE %]New[% END %] Authority type [% ELSIF op == 'delete_confirm' %] › Confirm deletion of authority type [% END %] @@ -70,7 +70,7 @@ <form action="/cgi-bin/koha/admin/authtypes.pl" name="Aform" method="post" class="validated"> <fieldset class="rows"> <legend> - [% IF authority_type.authtypecode %] + [% IF authority_type.authtypecode.defined %] Modify authority type [% ELSE %] New authority type @@ -78,7 +78,7 @@ </legend> <ol> <li> - [% IF authority_type.authtypecode %] + [% IF authority_type.authtypecode.defined %] <span class="label">Authority type</span> <input type="hidden" name="op" value="add_validate" /> <input type="hidden" name="checked" value="0" /> @@ -103,7 +103,7 @@ <label for="auth_tag_to_report">Authority field to copy: </label> <input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="[% authority_type.auth_tag_to_report %]" /> <input type="hidden" name="op" value="add_validate" /> - [% IF authority_type.authtypecode %] + [% IF authority_type.authtypecode.defined %] <input type="hidden" name="is_a_modif" value="1" /> [% END %] </li> -- 2.7.0