From 0d7ce6bf91ef293e8a6c1826cac60a63e8baa04c Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 21 Dec 2016 02:46:57 +0000 Subject: [PATCH] Bug 17799: MARC bibliographic frameworks breadcrumbs broken for Default framework To test: 1) Go to Admin -> MARC frameworks -> Default framework actions -> MARC structure 2) Click New tag 3) Notice the breadcrumbs say '()' instead of 'Default MARC framework' or something more appropriate 4) Apply patch and refresh page 5) Confirm breadcrumbs are now filled correctly 6) Go back to tag structure and try deleting a tag (Actions -> Delete) 7) Confirm breadcrubs are filled correctly Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Kyle M Hall Signed-off-by: Kyle M Hall (cherry picked from commit fdc15cb7623ed2ed8cd2d0b3fcfbd96d90f59041) Signed-off-by: Katrin Fischer (cherry picked from commit 87e3be143b99f7094848045b044ea7685605cf64) Signed-off-by: Julian Maurice --- .../intranet-tmpl/prog/en/modules/admin/marctagstructure.tt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt index bd42b65c45..d94609dfdf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tt @@ -33,15 +33,15 @@ $(document).ready(function() { › Administration › MARC frameworks [% IF ( add_form ) %] -› [% frameworktext %] ([% frameworkcode %]) +› [% IF frameworkcode %][% frameworktext %] ([% frameworkcode %])[% ELSE %]Default MARC framework[% END %] › [% action %] [% searchfield %] [% ELSIF ( else ) %] › [% IF ( frameworkcode ) %][% frameworktext %] ([% frameworkcode %])[% ELSE %]Default MARC framework[% END %] [% ELSIF ( delete_confirm ) %] -› [% frameworktext %] ([% frameworkcode %]) +› [% IF frameworkcode %][% frameworktext %] ([% frameworkcode %])[% ELSE %]Default MARC framework[% END %] › Confirm deletion of tag '[% searchfield %]' [% ELSIF ( delete_confirmed ) %] -› [% frameworktext %] ([% frameworkcode %]) +› [% IF frameworkcode %][% frameworktext %] ([% frameworkcode %])[% ELSE %]Default MARC framework[% END %] › Data deleted [% END %]