Attachment 79161 Details for Bug 18606 – Bug 18606: Fix TT filters

[patch] Bug 18606: Fix TT filters

Bug-18606-Fix-TT-filters.patch (text/plain), 8.48 KB, created by Josef Moravec on 2018-09-20 11:58:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2018-09-20 11:58:21 UTC

Size: 8.48 KB

patch

obsolete

>From 025f3fb4a1868324efdf0d84560c6eea91d740ec Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>Date: Thu, 20 Sep 2018 11:57:47 +0000
>Subject: [PATCH] Bug 18606: Fix TT filters
>
>---
> .../prog/en/modules/rotating_collections/addItems.tt           |  8 ++++----
> .../prog/en/modules/rotating_collections/editCollections.tt    |  2 +-
> .../en/modules/rotating_collections/rotatingCollections.tt     | 10 +++++-----
> .../prog/en/modules/rotating_collections/transferCollection.tt |  2 +-
> 4 files changed, 11 insertions(+), 11 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
>index 5498577..173edfd 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/addItems.tt
>@@ -10,7 +10,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'cat-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collection.colId %]">Collection <i>[% collection.colTitle | html %]</i></a> &rsaquo; Add or remove items</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collection.colId | uri %]">Collection <i>[% collection.colTitle | html %]</i></a> &rsaquo; Add or remove items</div>
> 
> <div id="doc3" class="yui-t2">
>     <div id="bd">
>@@ -87,10 +87,10 @@
>                     </tr>
>                     [% FOREACH item IN collection.items %]
>                       <tr>
>-                        <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = item.biblionumber %][% item.biblio.title |html %]</a></td>
>-                        <td>[% item.itemcallnumber | html%]</td>
>+                        <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = item.biblionumber %][% item.biblio.title | html %]</a></td>
>+                        <td>[% item.itemcallnumber | html %]</td>
>                         <td>[% item.barcode | html %]</td>
>-                        <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collection.colId | html %]&amp;barcode=[% item.barcode | html %]&amp;removeItem=1&amp;action=addItem">Remove</a></td>
>+                        <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collection.colId | uri %]&amp;barcode=[% item.barcode | uri %]&amp;removeItem=1&amp;action=addItem">Remove</a></td>
>                       </tr>
>                     [% END %]
>                   </table>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
>index f3db737..b1e8142 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/editCollections.tt
>@@ -19,7 +19,7 @@
>     [%- IF ( action == "new" ) %]
>         Add a new collection
>     [% ELSE %]
>-        <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collection.colId | html %]">Collection <i>[% collection.colTitle | html %]</i></a> &rsaquo; Edit
>+        <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collection.colId | uri %]">Collection <i>[% collection.colTitle | html %]</i></a> &rsaquo; Edit
>     [% END -%]
> </div>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
>index 86343e2..2064867 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/rotatingCollections.tt
>@@ -36,7 +36,7 @@
>                             <tbody>
>                             [% FOREACH collectionsLoo IN collectionsLoop %]
>                                 <tr>
>-                                    <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | html %]">[% collectionsLoo.colTitle | html %]</a></td>
>+                                    <td><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | uri %]">[% collectionsLoo.colTitle | html %]</a></td>
>                                     <td>[% collectionsLoo.colDesc | html %]</td>
>                                     <td>[% Branches.GetName( collectionsLoo.colBranchcode ) | html %]</td>
>                                     <td>
>@@ -44,10 +44,10 @@
>                                         <a class="btn btn-default btn-xs" dropdown-toggle" id="collectionsactions[% collectionsLoo.colId | html %]" role="button" data-toggle="dropdown" href="#">
>                                         Actions <b class="caret"></b></a>
>                                         <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="collectionsactions[% collectionsLoo.colId | html %]">
>-                                            <li><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | html %]"><i class="fa fa-plus"></i> Add or remove items</a></li>
>-                                            <li><a href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% collectionsLoo.colId | html %]"><i class="fa fa-exchange"></i> Transfer</a></li>
>-                                            <li><a href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% collectionsLoo.colId | html %]"><i class="fa fa-pencil"></i> Edit</a></li>
>-                                            <li><a class="confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% collectionsLoo.colId | html %]"><i class="fa fa-trash"></i> Delete</a></li>
>+                                            <li><a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-plus"></i> Add or remove items</a></li>
>+                                            <li><a href="/cgi-bin/koha/rotating_collections/transferCollection.pl?colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-exchange"></i> Transfer</a></li>
>+                                            <li><a href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=edit&amp;colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-pencil"></i> Edit</a></li>
>+                                            <li><a class="confirmdelete" href="/cgi-bin/koha/rotating_collections/editCollections.pl?action=delete&amp;colId=[% collectionsLoo.colId | uri %]"><i class="fa fa-trash"></i> Delete</a></li>
>                                         </ul>
>                                     </div>
>                                     </td>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
>index 8eac2dc..3f098ba 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/rotating_collections/transferCollection.tt
>@@ -10,7 +10,7 @@
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'cat-search.inc' %]
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collection.colId | html %]">Collection <i>[% collection.colTitle | html %]</i></a> &rsaquo; Transfer collection</div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/rotatingCollections.pl">Rotating collections</a> &rsaquo; <a href="/cgi-bin/koha/rotating_collections/addItems.pl?colId=[% collection.colId | uri %]">Collection <i>[% collection.colTitle | html %]</i></a> &rsaquo; Transfer collection</div>
> 
> <div id="doc3" class="yui-t2">
>     <div id="bd">
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 18606: 63508 | 63509 | 63510 | 63511 | 63512 | 63513 | 63514 | 63515 | 63516 | 63517 | 63518 | 63519 | 63520 | 63521 | 63522 | 63523 | 63524 | 63525 | 63526 | 63527 | 63528 | 66227 | 66228 | 66229 | 66230 | 66231 | 66232 | 66233 | 66234 | 66235 | 66236 | 66237 | 66238 | 66239 | 66240 | 66241 | 66286 | 66287 | 66288 | 66289 | 66290 | 66291 | 66292 | 66293 | 66294 | 66295 | 66296 | 66297 | 66298 | 66299 | 66300 | 67734 | 67735 | 67736 | 67737 | 67738 | 67739 | 67740 | 67741 | 67742 | 67743 | 67744 | 67745 | 67746 | 67747 | 67748 | 67749 | 68428 | 68429 | 68430 | 68431 | 68432 | 68433 | 68434 | 68435 | 68436 | 68437 | 68438 | 68439 | 68440 | 68441 | 68442 | 68443 | 69709 | 69710 | 69711 | 69712 | 69713 | 69714 | 69715 | 69716 | 69717 | 69718 | 69719 | 69720 | 69721 | 69722 | 69723 | 69759 | 72416 | 72417 | 72418 | 72419 | 72420 | 72421 | 72422 | 72423 | 72424 | 72425 | 72426 | 72427 | 72428 | 72429 | 72430 | 72431 | 72572 | 72573 | 72574 | 72575 | 72576 | 72577 | 72578 | 72579 | 72580 | 72581 | 72582 | 72583 | 72584 | 72585 | 72586 | 72587 | 72816 | 79141 | 79142 | 79143 | 79144 | 79145 | 79146 | 79147 | 79148 | 79149 | 79150 | 79151 | 79152 | 79153 | 79154 | 79155 | 79156 | 79157 | 79158 | 79161