Bugzilla – Attachment 80096 Details for
Bug 11897
Stock Rotation for Koha
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11897: (QA follow-up) Template filter fixes
Bug-11897-QA-follow-up-Template-filter-fixes.patch (text/plain), 39.06 KB, created by
Martin Renvoize (ashimema)
on 2018-10-05 14:12:04 UTC
(
hide
)
Description:
Bug 11897: (QA follow-up) Template filter fixes
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2018-10-05 14:12:04 UTC
Size:
39.06 KB
patch
obsolete
>From c1680256841eb0bb520cddd0354c3d6ec06013e8 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Thu, 4 Oct 2018 16:44:50 -0300 >Subject: [PATCH] Bug 11897: (QA follow-up) Template filter fixes > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../prog/en/includes/biblio-view-menu.inc | 2 +- > .../en/includes/stockrotation-toolbar.inc | 4 +- > .../en/modules/catalogue/stockrotation.tt | 33 ++--- > .../prog/en/modules/tools/stockrotation.tt | 129 +++++++++--------- > 4 files changed, 85 insertions(+), 83 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc >index 29f8d67524..430ad211cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc >@@ -40,6 +40,6 @@ > [% IF ( issuehistoryview ) %]<li class="active">[% ELSE %]<li>[% END %] > <a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio_object_id | url %]" >Checkout history</a></li> > [% IF ( CAN_user_tools_view_system_logs ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&modules=CATALOGUING&action=MODIFY&object=[% biblio_object_id | url %]">Modification log</a> </li>[% END %] >-[% IF ( CAN_user_stockrotation_manage_rota_items && Koha.Preference('StockRotation') ) %][% IF ( stockrotationview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/catalogue/stockrotation.pl?biblionumber=[% biblio_object_id %]">Rota</a> </li>[% END %] >+[% IF ( CAN_user_stockrotation_manage_rota_items && Koha.Preference('StockRotation') ) %][% IF ( stockrotationview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/catalogue/stockrotation.pl?biblionumber=[% biblio_object_id | uri %]">Rota</a> </li>[% END %] > </ul> > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc >index f574b19978..c46335eed9 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/stockrotation-toolbar.inc >@@ -4,9 +4,9 @@ > <a id="addrota" class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota"><i class="fa fa-plus"></i> New rota</a> > [% END %] > [% IF op == 'manage_stages' %] >- <a id="editrota" class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&rota_id=[% rota_id %]"><i class="fa fa-pencil"></i> Edit rota</a> >+ <a id="editrota" class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</a> > [% END %] > [% IF op == 'manage_items' %] >- <a id="editrota" class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&rota_id=[% rota_id %]"><i class="fa fa-pencil"></i> Edit rota</a> >+ <a id="editrota" class="btn btn-default btn-sm" href="/cgi-bin/koha/tools/stockrotation.pl?op=create_edit_rota&rota_id=[% rota_id | uri %]"><i class="fa fa-pencil"></i> Edit rota</a> > [% END %] > </div> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >index 5d6238dff0..b12e7bec7b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/stockrotation.tt >@@ -1,13 +1,14 @@ >+[% USE raw %] > [% USE Koha %] > [% USE Branches %] > [% INCLUDE 'doc-head-open.inc' %] >-<title>Koha › Catalog › Stock rotation details for [% biblio.title %]</title> >+<title>Koha › Catalog › Stock rotation details for [% biblio.title | html %]</title> > [% INCLUDE 'doc-head-close.inc' %] > [% INCLUDE 'browser-strings.inc' %] >-[% Asset.js("js/browser.js") %] >+[% Asset.js("js/browser.js") | $raw %] > <script type="text/javascript"> > //<![CDATA[ >- var browser = KOHA.browser('[% searchid %]', parseInt('[% biblionumber %]', 10)); >+ var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10)); > browser.show(); > //]]> > </script> >@@ -17,7 +18,7 @@ > [% INCLUDE 'header.inc' %] > [% INCLUDE 'cat-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Stock rotation details for <i>[% biblio.title | html %][% FOREACH subtitle IN biblio.subtitles %][% subtitle.subfield %][% END %]</i></div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/catalogue/search.pl">Catalog</a> › Stock rotation details for <i>[% biblio.title | html %][% FOREACH subtitle IN biblio.subtitles %][% subtitle.subfield | html %][% END %]</i></div> > > <div id="doc3" class="yui-t2"> > >@@ -46,10 +47,10 @@ > <tbody> > [% FOREACH item IN items %] > <tr> >- <td>[% item.bib_item.barcode %]</td> >- <td>[% item.bib_item.itemcallnumber %]</td> >+ <td>[% item.bib_item.barcode | html %]</td> >+ <td>[% item.bib_item.itemcallnumber | html %]</td> > <td> >- [% item.rota.title %] >+ [% item.rota.title | html %] > </td> > <td> > [% IF item.rota %] >@@ -80,7 +81,7 @@ > [% ELSE %] > <span class="stage"> > [% END %] >- [% Branches.GetName(this_stage.branchcode_id) %] ([% this_stage.duration %]) >+ [% Branches.GetName(this_stage.branchcode_id) | html %] ([% this_stage.duration | html %]) > </span> > » > [% END %] >@@ -98,7 +99,7 @@ > [% IF item.stockrotationitem %] > [% in_transit = item.bib_item.get_transfer %] > [% IF !in_transit && item.stages.size > 1 %] >- <a class="btn btn-default btn-xs" href="?op=move_to_next_stage&stage_id=[% item.stockrotationitem.stage.stage_id %]&item_id=[% item.bib_item.id %]&biblionumber=[% biblionumber %]"> >+ <a class="btn btn-default btn-xs" href="?op=move_to_next_stage&stage_id=[% item.stockrotationitem.stage.stage_id | uri %]&item_id=[% item.bib_item.id | uri %]&biblionumber=[% biblionumber | uri %]"> > [% ELSE %] > <a class="btn btn-default btn-xs" disabled> > [% END %] >@@ -106,7 +107,7 @@ > Move to next stage > </a> > [% IF !in_transit %] >- <a class="btn btn-default btn-xs" href="?op=toggle_in_demand&stage_id=[% item.stockrotationitem.stage.stage_id %]&item_id=[% item.bib_item.id %]&biblionumber=[% biblionumber %]"> >+ <a class="btn btn-default btn-xs" href="?op=toggle_in_demand&stage_id=[% item.stockrotationitem.stage.stage_id | uri %]&item_id=[% item.bib_item.id | uri %]&biblionumber=[% biblionumber | uri %]"> > [% ELSE %] > <a class="btn btn-default btn-xs" disabled> > [% END %] >@@ -118,7 +119,7 @@ > [% END %] > </a> > [% IF !in_transit %] >- <a class="btn btn-default btn-xs" href="?op=confirm_remove_from_rota&stage_id=[% item.stockrotationitem.stage.stage_id %]&item_id=[% item.bib_item.id %]&biblionumber=[% biblionumber %]"> >+ <a class="btn btn-default btn-xs" href="?op=confirm_remove_from_rota&stage_id=[% item.stockrotationitem.stage.stage_id | uri %]&item_id=[% item.bib_item.id | uri %]&biblionumber=[% biblionumber | uri %]"> > [% ELSE %] > <a class="btn btn-default btn-xs" disabled> > [% END %] >@@ -129,13 +130,13 @@ > <form class="rota_select_form" method="post" enctype="multipart/form-data"> > <select class="item_select_rota" name="rota_id"> > [% FOREACH rota IN rotas %] >- <option value="[% rota.rota_id %]">[% rota.title %]</option> >+ <option value="[% rota.rota_id | uri %]">[% rota.title | html %]</option> > [% END %] > </select> > <button class="btn btn-default btn-xs" type="submit"><i class="fa fa-plus"></i> Add to rota</button> > <input type="hidden" name="op" value="add_item_to_rota"></input> >- <input type="hidden" name="item_id" value="[% item.bib_item.id %]"></input> >- <input type="hidden" name="biblionumber" value="[% biblionumber %]"></input> >+ <input type="hidden" name="item_id" value="[% item.bib_item.id | uri %]"></input> >+ <input type="hidden" name="biblionumber" value="[% biblionumber | uri %]"></input> > </form> > [% END %] > </td> >@@ -154,8 +155,8 @@ > <div class="dialog alert"> > <h3>Are you sure you want to remove this item from it's rota?</h3> > <p> >- <a class="btn btn-default btn-xs approve" href="?op=remove_item_from_stage&stage_id=[% stage_id %]&item_id=[% item_id %]&biblionumber=[% biblionumber %]"><i class="fa fa-fw fa-check"></i>Yes</a> >- <a class="btn btn-default btn-xs deny" href="?biblionumber=[% biblionumber %]"><i class="fa fa-fw fa-remove"></i>No</a> >+ <a class="btn btn-default btn-xs approve" href="?op=remove_item_from_stage&stage_id=[% stage_id | uri %]&item_id=[% item_id | uri %]&biblionumber=[% biblionumber | uri %]"><i class="fa fa-fw fa-check"></i>Yes</a> >+ <a class="btn btn-default btn-xs deny" href="?biblionumber=[% biblionumber | uri %]"><i class="fa fa-fw fa-remove"></i>No</a> > </p> > </div> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >index 9dec3d93b2..173d8641fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt >@@ -1,12 +1,13 @@ >+[% USE raw %] > [% USE Koha %] > [% USE Branches %] > [% USE KohaDates %] > [% INCLUDE 'doc-head-open.inc' %] > <title>Koha › Stock rotation</title> > [% INCLUDE 'doc-head-close.inc' %] >-[% Asset.css("css/datatables.css") %] >+[% Asset.css("css/datatables.css") | $raw %] > [% INCLUDE 'datatables.inc' %] >-[% Asset.js("js/pages/stockrotation.js") %] >+[% Asset.js("js/pages/stockrotation.js") | $raw %] > <script type="text/javascript"> > //<![CDATA[ > $(document).ready(function() { >@@ -23,7 +24,7 @@ > </script> > </head> > >-<body> >+<body id="tools_stockrotation" class="tools"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'patron-search.inc' %] > >@@ -44,10 +45,10 @@ > [% ELSIF (op == 'manage_stages') %] > › Manage stages > [% ELSIF (op == 'create_edit_stage' && stage.id) %] >- <a href="?op=manage_stages&rota_id=[% rota_id %]">› Manage stages</a> >+ <a href="?op=manage_stages&rota_id=[% rota_id | uri %]">› Manage stages</a> > › Edit stage > [% ELSIF (op == 'create_edit_stage' && !stage.id) %] >- <a href="?op=manage_stages&rota_id=[% rota_id %]">› Manage stages</a> >+ <a href="?op=manage_stages&rota_id=[% rota_id | uri %]">› Manage stages</a> > › Create stage > [% ELSIF (op == 'manage_items') %] > › Manage items >@@ -79,13 +80,13 @@ > <tbody> > [% FOREACH rota IN existing_rotas %] > <tr> >- <td>[% rota.title %]</td> >- <td>[% rota.cyclical ? 'Yes' : 'No'%]</td> >- <td>[% rota.active ? 'Yes' : 'No'%]</td> >- <td>[% rota.description %]</td> >- <td>[% rota.stockrotationitems.count %]</td> >+ <td>[% rota.title | html %]</td> >+ <td>[% rota.cyclical ? 'Yes' : 'No' | html %]</td> >+ <td>[% rota.active ? 'Yes' : 'No' | html %]</td> >+ <td>[% rota.description | html %]</td> >+ <td>[% rota.stockrotationitems.count | html %]</td> > <td class="actions"> >- <a class="btn btn-default btn-xs" href="?op=create_edit_rota&rota_id=[% rota.rota_id %]"> >+ <a class="btn btn-default btn-xs" href="?op=create_edit_rota&rota_id=[% rota.rota_id | uri %]"> > <i class="fa fa-pencil"></i> > Edit > </a> >@@ -95,13 +96,13 @@ > <i class="fa fa-caret-down"></i> > </button> > <ul class="dropdown-menu"> >- <li><a href="?op=manage_stages&rota_id=[% rota.rota_id %]">Stages</a></li> >+ <li><a href="?op=manage_stages&rota_id=[% rota.rota_id | uri %]">Stages</a></li> > [% IF CAN_user_stockrotation_manage_rota_items && rota.stockrotationstages.count > 0 %] >- <li><a href="?op=manage_items&rota_id=[% rota.rota_id %]">Items</a></li> >+ <li><a href="?op=manage_items&rota_id=[% rota.rota_id | uri %]">Items</a></li> > [% END %] > </ul> > </div> >- <a class="btn btn-default btn-xs" href="?op=toggle_rota&rota_id=[% rota.rota_id %]"> >+ <a class="btn btn-default btn-xs" href="?op=toggle_rota&rota_id=[% rota.rota_id | uri %]"> > <i class="fa fa-power-off"></i> > [% IF !rota.active %] > Activate >@@ -119,7 +120,7 @@ > [% ELSIF (op == 'create_edit_rota') %] > > [% IF rota.rota_id %] >- <h2>Edit "[% rota.title %]"</h2> >+ <h2>Edit "[% rota.title | html %]"</h2> > [% ELSE %] > <h2>Create new rota</h2> > [% END %] >@@ -135,7 +136,7 @@ > <ol> > <li> > <label class="required" for="title">Name:</label> >- <input type="text" id="title" name="title" value="[% rota.title %]" required="required" placeholder="Rota name"> >+ <input type="text" id="title" name="title" value="[% rota.title | html %]" required="required" placeholder="Rota name"> > <span class="required">Required</span> > </li> > <li> >@@ -152,7 +153,7 @@ > </li> > <li> > <label for="description">Description:</label> >- <textarea id="description" name="description" placeholder="Rota description">[% rota.description %]</textarea> >+ <textarea id="description" name="description" placeholder="Rota description">[% rota.description | html %]</textarea> > </li> > </ol> > </fieldset> >@@ -161,7 +162,7 @@ > <a href="/cgi-bin/koha/tools/stockrotation.pl" class="cancel">Cancel</a> > </fieldset> > [% IF rota.rota_id %] >- <input type="hidden" name="id" value="[% rota.rota_id %]"> >+ <input type="hidden" name="id" value="[% rota.rota_id | html %]"> > [% END %] > <input type="hidden" name="op" value="process_rota"> > </form> >@@ -176,7 +177,7 @@ > </div> > [% END %] > >- <h2>Manage [% rota.title %] stages</h2> >+ <h2>Manage [% rota.title | html %] stages</h2> > <div id="ajax_status" > data-saving-msg="Saving changes..." > data-success-msg="" >@@ -198,9 +199,9 @@ > <select name="branchcode" id="branch"> > [% FOREACH branch IN branches %] > [% IF branch.branchcode == stage.branchcode_id %] >- <option value="[% branch.branchcode %]" selected>[% Branches.GetName(branch.branchcode) %]</option> >+ <option value="[% branch.branchcode | html %]" selected>[% Branches.GetName(branch.branchcode) | html %]</option> > [% ELSE %] >- <option value="[% branch.branchcode %]">[% Branches.GetName(branch.branchcode) %]</option> >+ <option value="[% branch.branchcode | html %]">[% Branches.GetName(branch.branchcode) | html %]</option> > [% END %] > [% END %] > </select> >@@ -208,7 +209,7 @@ > </li> > <li> > <label class="required" for="duration">Duration:</label> >- <input type="text" id="duration" name="duration" value="[% stage.duration %]" required="required" placeholder="Duration (days)"> >+ <input type="text" id="duration" name="duration" value="[% stage.duration | html %]" required="required" placeholder="Duration (days)"> > <span class="required">Required</span> > </li> > </ol> >@@ -216,8 +217,8 @@ > <fieldset class="action"> > <input type="submit" value="Submit"> > </fieldset> >- <input type="hidden" name="stage_id" value="[% stage.id %]"> >- <input type="hidden" name="rota_id" value="[% rota_id %]"> >+ <input type="hidden" name="stage_id" value="[% stage.id | html %]"> >+ <input type="hidden" name="rota_id" value="[% rota_id | html %]"> > <input type="hidden" name="op" value="process_stage"> > </form> > >@@ -230,21 +231,21 @@ > <span class="stagename">Library</span> > <span class="stageduration">Duration (days)</span> > </div> >- <ul id="sortable_stages" data-rota-id="[% rota.rota_id %]"> >+ <ul id="sortable_stages" data-rota-id="[% rota.rota_id | html %]"> > [% FOREACH stage IN existing_stages %] >- <li id="stage_[% stage.stage_id %]"> >+ <li id="stage_[% stage.stage_id | html %]"> > <span data-toggle="tooltip" title="Drag and drop to move this stage to another position" data-placement="right" class="stagename"> > [% IF existing_stages.size > 1 %] > <i class="drag_handle fa fa-lg fa-bars"></i> > [% END %] >- [% Branches.GetName(stage.branchcode_id) %] >+ [% Branches.GetName(stage.branchcode_id) | html %] > </span> >- <span class="stageduration">[% stage.duration %]</span> >+ <span class="stageduration">[% stage.duration | html %]</span> > <span class="stageactions"> >- <a class="btn btn-default btn-xs" href="?op=create_edit_stage&stage_id=[% stage.stage_id %]"> >+ <a class="btn btn-default btn-xs" href="?op=create_edit_stage&stage_id=[% stage.stage_id | uri %]"> > <i class="fa fa-pencil"></i> Edit > </a> >- <a class="btn btn-default btn-xs" href="?op=confirm_delete_stage&stage_id=[% stage.stage_id %]"> >+ <a class="btn btn-default btn-xs" href="?op=confirm_delete_stage&stage_id=[% stage.stage_id | uri %]"> > <i class="fa fa-trash"></i> Delete > </a> > </span> >@@ -259,7 +260,7 @@ > [% ELSIF (op == 'create_edit_stage') %] > > [% IF stage.id %] >- <h2>Edit "[% Branches.GetName(stage.branchcode_id) %]"</h2> >+ <h2>Edit "[% Branches.GetName(stage.branchcode_id) | html %]"</h2> > [% ELSE %] > <h2>Create new stage</h2> > [% END %] >@@ -278,9 +279,9 @@ > <select name="branchcode" id="branch"> > [% FOREACH branch IN branches %] > [% IF branch.branchcode == stage.branchcode_id %] >- <option value="[% branch.branchcode %]" selected>[% Branches.GetName(branch.branchcode) %]</option> >+ <option value="[% branch.branchcode | html %]" selected>[% Branches.GetName(branch.branchcode) | html %]</option> > [% ELSE %] >- <option value="[% branch.branchcode %]">[% Branches.GetName(branch.branchcode) %]</option> >+ <option value="[% branch.branchcode | html %]">[% Branches.GetName(branch.branchcode) | html %]</option> > [% END %] > [% END %] > </select> >@@ -288,17 +289,17 @@ > </li> > <li> > <label class="required" for="duration">Duration:</label> >- <input type="text" id="duration" name="duration" value="[% stage.duration %]" required="required" placeholder="Duration (days)"> >+ <input type="text" id="duration" name="duration" value="[% stage.duration | html %]" required="required" placeholder="Duration (days)"> > <span class="required">Required</span> > </li> > </ol> > </fieldset> > <fieldset class="action"> > <input type="submit" value="Save"> >- <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_stages&rota_id=[% rota_id %]" class="cancel">Cancel</a> >+ <a href="/cgi-bin/koha/tools/stockrotation.pl?op=manage_stages&rota_id=[% rota_id | uri %]" class="cancel">Cancel</a> > </fieldset> >- <input type="hidden" name="stage_id" value="[% stage.id %]"> >- <input type="hidden" name="rota_id" value="[% rota_id %]"> >+ <input type="hidden" name="stage_id" value="[% stage.id | html %]"> >+ <input type="hidden" name="rota_id" value="[% rota_id | html %]"> > <input type="hidden" name="op" value="process_stage"> > </form> > [% ELSIF (op == 'confirm_remove_from_rota') %] >@@ -306,8 +307,8 @@ > <div class="dialog alert"> > <h3>Are you sure you wish to remove this item from it's rota</h3> > <p> >- <a class="btn btn-default btn-xs approve" href="?op=remove_item_from_stage&item_id=[% item_id %]&stage_id=[% stage_id %]&rota_id=[% rota_id %]"><i class="fa fa-fw fa-check"></i>Yes</a> >- <a class="btn btn-default btn-xs deny" href="?op=manage_items&rota_id=[% rota_id %]"><i class="fa fa-fw fa-remove"></i>No</a> >+ <a class="btn btn-default btn-xs approve" href="?op=remove_item_from_stage&item_id=[% item_id | uri %]&stage_id=[% stage_id | uri %]&rota_id=[% rota_id | uri %]"><i class="fa fa-fw fa-check"></i>Yes</a> >+ <a class="btn btn-default btn-xs deny" href="?op=manage_items&rota_id=[% rota_id | uri %]"><i class="fa fa-fw fa-remove"></i>No</a> > </p> > </div> > [% ELSIF (op == 'confirm_delete_stage') %] >@@ -318,13 +319,13 @@ > <p>This stage contains the following item(s):</p> > <ul> > [% FOREACH item IN stage.stockrotationitems %] >- <li>[% item.itemnumber.biblio.title %] (Barcode: [% item.itemnumber.barcode %])</li> >+ <li>[% item.itemnumber.biblio.title | html %] (Barcode: [% item.itemnumber.barcode | html %])</li> > [% END %] > </ul> > [% END %] > <p> >- <a class="btn btn-default btn-xs approve" href="?op=delete_stage&stage_id=[% stage.stage_id %]"><i class="fa fa-fw fa-check"></i>Yes</a> >- <a class="btn btn-default btn-xs deny" href="?op=manage_stages&rota_id=[% stage.rota.rota_id %]"><i class="fa fa-fw fa-remove"></i>No</a> >+ <a class="btn btn-default btn-xs approve" href="?op=delete_stage&stage_id=[% stage.stage_id | uri %]"><i class="fa fa-fw fa-check"></i>Yes</a> >+ <a class="btn btn-default btn-xs deny" href="?op=manage_stages&rota_id=[% stage.rota.rota_id | uri %]"><i class="fa fa-fw fa-remove"></i>No</a> > </p> > </div> > [% ELSIF (op == 'manage_items') %] >@@ -341,12 +342,12 @@ > </div> > [% END %] > >- <h2>Manage [% rota.title %] items</h2> >+ <h2>Manage [% rota.title | html %] items</h2> > > <div> > <form id="add_rota_item_form" method="post" enctype="multipart/form-data" class="validated"> > <fieldset class="rows"> >- <legend>Add item to "[% rota.title %]"</legend> >+ <legend>Add item to "[% rota.title | html %]"</legend> > <ol> > <li> > <label for="barcode">Barcode:</label> >@@ -366,13 +367,13 @@ > <fieldset class="action"> > <input type="submit" value="Save"> > </fieldset> >- <input type="hidden" name="rota_id" value="[% rota.id %]"> >+ <input type="hidden" name="rota_id" value="[% rota.id | html %]"> > <input type="hidden" name="op" value="add_items_to_rota"> > </form> > </div> > > [% IF items.count > 0 %] >- <h3>Manage items assigned to "[% rota.title %]"</h3> >+ <h3>Manage items assigned to "[% rota.title | html %]"</h3> > <table id="sr_manage_items" class="items_table" role="grid"> > <thead> > <th>Barcode</th> >@@ -386,11 +387,11 @@ > <tbody> > [% FOREACH item IN items %] > <tr> >- <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.id %]&biblionumber=[% item.itemnumber.biblio.id %]#item[% item.id %]">[% item.itemnumber.barcode %]</a></td> >- <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.itemnumber.biblio.id %]">[% item.itemnumber.biblio.title %]</a></td> >- <td>[% item.itemnumber.biblio.author %]</td> >- <td>[% item.itemnumber.itemcallnumber %]</td> >- <td>[% item.itemnumber.get_transfer ? 'Yes' : 'No' %]</td> >+ <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.id | uri %]&biblionumber=[% item.itemnumber.biblio.id | uri %]#item[% item.id | uri %]">[% item.itemnumber.barcode | html %]</a></td> >+ <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.itemnumber.biblio.id | uri %]">[% item.itemnumber.biblio.title | html %]</a></td> >+ <td>[% item.itemnumber.biblio.author | html %]</td> >+ <td>[% item.itemnumber.itemcallnumber | html %]</td> >+ <td>[% item.itemnumber.get_transfer ? 'Yes' : 'No' | html %]</td> > <td> > [% FOREACH this_stage IN stages %] > [% IF this_stage.stage_id == item.stage.stage_id %] >@@ -398,18 +399,18 @@ > [% ELSE %] > <span class="stage"> > [% END %] >- [% Branches.GetName(this_stage.branchcode_id) %] ([% this_stage.duration %]) >+ [% Branches.GetName(this_stage.branchcode_id) | html %] ([% this_stage.duration | html %]) > </span> > » > [% END %] > [% IF stages.size > 0 %] >- <span class="stage">[% rota.cyclical ? 'START' : 'END' %]</span> >+ <span class="stage">[% rota.cyclical ? 'START' : 'END' | html %]</span> > [% END %] > </td> > <td class="actions"> > [% in_transit = item.itemnumber.get_transfer %] > [% IF !in_transit && stages.size > 1 %] >- <a class="btn btn-default btn-xs" href="?op=move_to_next_stage&rota_id=[% rota.id %]&item_id=[% item.id %]&stage_id=[% item.stage.stage_id %]"> >+ <a class="btn btn-default btn-xs" href="?op=move_to_next_stage&rota_id=[% rota.id | uri %]&item_id=[% item.id | uri %]&stage_id=[% item.stage.stage_id | uri %]"> > [% ELSE %] > <a class="btn btn-default btn-xs" disabled> > [% END %] >@@ -417,15 +418,15 @@ > Move to next stage > </a> > [% IF !in_transit %] >- <a class="btn btn-default btn-xs" href="?op=toggle_in_demand&stage_id=[% item.stage.stage_id %]&item_id=[% item.id %]&rota_id=[% rota.id %]"> >+ <a class="btn btn-default btn-xs" href="?op=toggle_in_demand&stage_id=[% item.stage.stage_id | uri %]&item_id=[% item.id | uri %]&rota_id=[% rota.id | uri %]"> > [% ELSE %] > <a class="btn btn-default btn-xs" disabled> > [% END %] > <i class="fa fa-fire"></i> >- [% item.indemand ? 'Remove "In demand"' : 'Add "In demand"' %] >+ [% item.indemand ? 'Remove "In demand"' : 'Add "In demand"' | html %] > </a> > [% IF !in_transit %] >- <a class="btn btn-default btn-xs" href="?op=confirm_remove_from_rota&stage_id=[% item.stage.stage_id %]&item_id=[% item.id %]&rota_id=[% rota.id %]"> >+ <a class="btn btn-default btn-xs" href="?op=confirm_remove_from_rota&stage_id=[% item.stage.stage_id | uri %]&item_id=[% item.id | uri %]&rota_id=[% rota.id | uri %]"> > [% ELSE %] > <a class="btn btn-default btn-xs" disabled> > [% END %] >@@ -452,7 +453,7 @@ > <h4>Items added to rota:</h4> > <ul> > [% FOREACH item_ok IN barcode_status.ok %] >- <li>[% item_ok.biblio.title %]</li> >+ <li>[% item_ok.biblio.title | html %]</li> > [% END %] > </ul> > [% END %] >@@ -460,7 +461,7 @@ > <h4>Items already on this rota:</h4> > <ul> > [% FOREACH item_on_this IN barcode_status.on_this %] >- <li>[% item_on_this.biblio.title %]</li> >+ <li>[% item_on_this.biblio.title | html %]</li> > [% END %] > </ul> > [% END %] >@@ -468,7 +469,7 @@ > <h4>Barcodes not found:</h4> > <ul> > [% FOREACH barcode_not_found IN barcode_status.not_found %] >- <li>[% barcode_not_found %]</li> >+ <li>[% barcode_not_found | html %]</li> > [% END %] > </ul> > [% END %] >@@ -476,7 +477,7 @@ > <h4>Items found on other rotas:</h4> > <ul> > [% FOREACH item_on_other IN barcode_status.on_other %] >- <li>[% item_on_other.biblio.title %]</li> >+ <li>[% item_on_other.biblio.title | html %]</li> > [% END %] > </ul> > [% END %] >@@ -486,18 +487,18 @@ > <fieldset> > <legend>Select items to move to this rota:</legend> > [% FOREACH item_on_other IN barcode_status.on_other %] >- <li><input type="checkbox" name="move_item" value="[% item_on_other.itemnumber %]"> [% item_on_other.biblio.title %] (Currently on "[% item_on_other.stockrotationitem.stage.rota.title %]")</li> >+ <li><input type="checkbox" name="move_item" value="[% item_on_other.itemnumber | html %]"> [% item_on_other.biblio.title | html %] (Currently on "[% item_on_other.stockrotationitem.stage.rota.title | html %]")</li> > [% END %] > > </fieldset> > <fieldset class="action"> > <input type="submit" value="Save"> > </fieldset> >- <input type="hidden" name="rota_id" value="[% rota_id %]"> >+ <input type="hidden" name="rota_id" value="[% rota_id | html %]"> > <input type="hidden" name="op" value="move_items_to_rota"> > </form> > [% END %] >- <p><a href="?op=manage_items&rota_id=[% rota_id %]">Return to rota</a></p> >+ <p><a href="?op=manage_items&rota_id=[% rota_id | uri %]">Return to rota</a></p> > > [% END %] > </div> >-- >2.19.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=80096">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11897
:
25887
|
58207
|
58208
|
58209
|
58210
|
58211
|
58212
|
58213
|
58214
|
58215
|
58216
|
58217
|
58218
|
58219
|
58280
|
58281
|
58687
|
58692
|
58693
|
58694
|
58695
|
58696
|
60175
|
60715
|
61825
|
61826
|
61827
|
61828
|
61829
|
61830
|
61831
|
61832
|
61833
|
61834
|
61835
|
61836
|
61837
|
61838
|
61839
|
61885
|
62730
|
62750
|
62751
|
62752
|
62753
|
62754
|
62755
|
62756
|
62757
|
62758
|
62759
|
62760
|
62761
|
62762
|
62763
|
62764
|
62765
|
62766
|
62767
|
63063
|
63064
|
63065
|
63066
|
63067
|
63068
|
63069
|
63070
|
63071
|
63072
|
63073
|
63074
|
63075
|
63076
|
63077
|
63078
|
63079
|
63080
|
63114
|
64850
|
64851
|
65715
|
65716
|
65717
|
65718
|
65719
|
65720
|
65721
|
65722
|
65723
|
65724
|
65725
|
65726
|
65727
|
65728
|
65729
|
65730
|
65731
|
65732
|
65733
|
65734
|
65735
|
65736
|
65737
|
65738
|
65739
|
65740
|
65741
|
65742
|
65743
|
65744
|
65745
|
65746
|
65747
|
65748
|
65749
|
65750
|
65751
|
65752
|
65753
|
65754
|
65755
|
65756
|
65757
|
65758
|
66381
|
70496
|
70497
|
70498
|
70499
|
70500
|
70501
|
70502
|
70503
|
70504
|
70505
|
70506
|
70507
|
70508
|
70509
|
70510
|
70511
|
70512
|
70513
|
70514
|
70515
|
70516
|
70517
|
70518
|
70519
|
70520
|
70521
|
70522
|
70523
|
70524
|
72124
|
72125
|
72126
|
72127
|
72128
|
74003
|
74004
|
74005
|
74006
|
74007
|
74008
|
74010
|
74011
|
74012
|
74013
|
74014
|
74015
|
74016
|
74017
|
74197
|
74198
|
74199
|
74200
|
74201
|
74202
|
74203
|
74204
|
74205
|
74206
|
74319
|
74320
|
74360
|
74459
|
74460
|
74461
|
74462
|
74463
|
74464
|
74465
|
74466
|
74467
|
74468
|
74469
|
74470
|
75409
|
75410
|
75411
|
75412
|
75413
|
75414
|
75415
|
75416
|
75417
|
75418
|
75419
|
75420
|
76121
|
76122
|
76123
|
76124
|
76125
|
76126
|
76127
|
76128
|
76129
|
76130
|
76131
|
76132
|
76133
|
76134
|
76135
|
76144
|
76706
|
76707
|
76708
|
76709
|
76710
|
77623
|
77624
|
77625
|
77626
|
78387
|
78388
|
78389
|
78390
|
78391
|
78392
|
78393
|
78394
|
78404
|
78405
|
78406
|
78407
|
78408
|
79040
|
79041
|
79042
|
79043
|
79044
|
79738
|
79739
|
79740
|
79741
|
79742
|
79746
|
79747
|
79748
|
79749
|
79750
|
79964
|
79965
|
79966
|
79967
|
79968
|
79969
|
79970
|
79971
|
79972
|
79973
|
79974
|
79975
|
80068
|
80087
|
80088
|
80089
|
80090
|
80091
|
80092
|
80093
|
80094
|
80095
|
80096
|
80097
|
80098
|
80099
|
80100
|
80118
|
80260
|
80261
|
80262
|
80263
|
80264
|
80265
|
80266
|
80267
|
80268
|
80269
|
80270
|
80271
|
80272
|
80273
|
80274
|
80275
|
80289
|
80298
|
80299
|
80300