Attachment 66255 Details for Bug 15326 – Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

[patch] Bug 15326: [FOLLOW-UP] Fixing library field in form, opac publishing

Bug-15326-FOLLOW-UP-Fixing-library-field-in-form-o.patch (text/plain), 3.53 KB, created by Aleisha Amohia on 2017-08-20 23:17:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Aleisha Amohia

Created: 2017-08-20 23:17:20 UTC

Size: 3.53 KB

patch

obsolete

>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

Actions: View | Diff | Splinter Review

Attachments on bug 15326: 45621 | 58272 | 58607 | 58608 | 58609 | 58787 | 63904 | 63905 | 64241 | 64941 | 64942 | 66255 | 70866 | 70867 | 70868 | 70869 | 70870 | 70871 | 76387 | 76388 | 76389 | 76390 | 76391 | 76392 | 78232 | 78233 | 78234 | 78235 | 78236 | 78237 | 78238 | 78240 | 79269 | 83318 | 83319 | 83320 | 83321 | 83322 | 83323 | 83324 | 83325 | 83326 | 83404 | 83405 | 83406 | 83407 | 83408 | 83409 | 83410 | 83411 | 83412 | 84682 | 84683 | 84684 | 84685 | 84686 | 84687 | 84688 | 84689 | 84690 | 84691 | 87494 | 87495 | 87496 | 87497 | 87498 | 87499 | 87500 | 87501 | 87502 | 87503 | 87608 | 87609 | 87610 | 87617 | 96084 | 96085 | 96086 | 96087 | 96088 | 96089 | 96090 | 96091 | 96092 | 96093 | 96094 | 96095 | 96096 | 96097 | 96098 | 97237 | 101565 | 101566 | 101567 | 101568 | 101569 | 101570 | 101571 | 101572 | 101573 | 101574 | 101575 | 101576 | 101577 | 101578 | 101579 | 101580 | 128341 | 128342 | 128343 | 128344 | 128345 | 128346 | 128347 | 128348 | 128349 | 128350 | 128351 | 128352 | 128353 | 128354 | 128355 | 128356 | 128357 | 128585 | 128642 | 136432 | 136757 | 136768 | 138489 | 138493 | 139028 | 139029 | 139030 | 139031 | 139111 | 139123 | 139124 | 139125 | 139172 | 139173 | 139174