From ed564ec1a2a25c3c59447c855f7a77ed1d9654f0 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia <aleishaamohia@hotmail.com> Date: Sun, 20 Aug 2017 23:16:21 +0000 Subject: [PATCH] Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing Fixes issues from Comment 19, please test --- koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt | 10 +++++----- opac/opac-cmspages.pl | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt index 43dac1a..d67bc0f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cmspages.tt @@ -158,11 +158,11 @@ tinyMCE.init({ </select> </li> <li> - <label for="branch">Library: </label> + <label for="branch">Library:</label> <select id="branch" name="branch"> - [% IF ( data.branchcode == "" ) %]<option value="" selected="selected">All libraries</option>[% ELSE %]<option value="">All libraries</option>[% END %] + [% IF ( data.branchcode.branchcode == "" ) %]<option value="" selected="selected">All libraries</option>[% ELSE %]<option value="">All libraries</option>[% END %] [% FOREACH branch IN branch_list %] - [% IF ( branch.branchcode == data.branchcode ) %]<option value="[% branch.branchcode %]" selected="selected">[% branch.branchname %]</option>[% ELSE %]<option value="[% branch.branchcode %]">[% branch.branchname %]</option>[% END %] + [% IF ( branch.branchcode == data.branchcode.branchcode ) %]<option value="[% branch.branchcode %]" selected="selected">[% branch.branchname %]</option>[% ELSE %]<option value="[% branch.branchcode %]">[% branch.branchname %]</option>[% END %] [% END %] </select> </li> @@ -219,12 +219,12 @@ tinyMCE.init({ [% IF ( disp == "2" ) %]<option value="2" selected="selected">OPAC</option>[% ELSE %]<option value="2">OPAC</option>[% END %] </select> - <label for="branch">Library: </label> + <label for="branch">Library:</label> <select id="branch" name="branch"> [% IF ( branch == "" ) %]<option value="" selected="selected">All libraries</option>[% ELSE %]<option value="">All libraries</option>[% END %] [% FOREACH br IN branch_list %] [% IF ( br.branchcode == branch ) %] - <option value="[% br.branchcode %]" selected="selected">[% br.branchname %]</option> + <option value="[% br.branchcode %]" selected="selected">[% br.branchname %]</option> [% ELSE %] <option value="[% br.branchcode %]">[% br.branchname %]</option> [% END %] diff --git a/opac/opac-cmspages.pl b/opac/opac-cmspages.pl index f93f2b8..37d5e9f 100755 --- a/opac/opac-cmspages.pl +++ b/opac/opac-cmspages.pl @@ -47,7 +47,7 @@ my ( $theme, $news_lang, $availablethemes ) = C4::Templates::themelanguage( my ( $page_list, $parent_list, $page_data ) = Koha::CmsPages->list( $id ); my $links = Koha::CmsPages->search( {}, { order_by => 'sortorder' } ); -my $cms_data = Koha::CmsPages->page( $id ); +my $cms_data = Koha::CmsPages->find( $id ); $template->param( links => $links, cms_page => $cms_data, -- 2.1.4