From 732ff4b1c6c46dfcd9c71943f62f33a1e6484608 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi 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 Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens --- .../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 ) %]
  • [% ELSE %]
  • [% END %] Checkout history
    • [% IF ( CAN_user_tools_view_system_logs ) %][% IF ( logview ) %]
  • [% ELSE %]
  • [% END %]Modification log
    • [% END %] -[% IF ( CAN_user_stockrotation_manage_rota_items && Koha.Preference('StockRotation') ) %][% IF ( stockrotationview ) %]
  • [% ELSE %]
  • [% END %]Rota
    • [% END %] +[% IF ( CAN_user_stockrotation_manage_rota_items && Koha.Preference('StockRotation') ) %][% IF ( stockrotationview ) %]
  • [% ELSE %]
  • [% END %]Rota
    • [% END %] 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 @@ New rota [% END %] [% IF op == 'manage_stages' %] - Edit rota + Edit rota [% END %] [% IF op == 'manage_items' %] - Edit rota + Edit rota [% END %] 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' %] -Koha › Catalog › Stock rotation details for [% biblio.title %] +Koha › Catalog › Stock rotation details for [% biblio.title | html %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'browser-strings.inc' %] -[% Asset.js("js/browser.js") %] +[% Asset.js("js/browser.js") | $raw %] @@ -17,7 +18,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] - +
    @@ -46,10 +47,10 @@ [% FOREACH item IN items %] - [% item.bib_item.barcode %] - [% item.bib_item.itemcallnumber %] + [% item.bib_item.barcode | html %] + [% item.bib_item.itemcallnumber | html %] - [% item.rota.title %] + [% item.rota.title | html %] [% IF item.rota %] @@ -80,7 +81,7 @@ [% ELSE %] [% END %] - [% Branches.GetName(this_stage.branchcode_id) %] ([% this_stage.duration %]) + [% Branches.GetName(this_stage.branchcode_id) | html %] ([% this_stage.duration | html %]) » [% END %] @@ -98,7 +99,7 @@ [% IF item.stockrotationitem %] [% in_transit = item.bib_item.get_transfer %] [% IF !in_transit && item.stages.size > 1 %] - + [% ELSE %] [% END %] @@ -106,7 +107,7 @@ Move to next stage [% IF !in_transit %] - + [% ELSE %] [% END %] @@ -118,7 +119,7 @@ [% END %] [% IF !in_transit %] - + [% ELSE %] [% END %] @@ -129,13 +130,13 @@
    - - + +
    [% END %] @@ -154,8 +155,8 @@

    Are you sure you want to remove this item from it's rota?

    - Yes - No + Yes + No

    [% 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' %] Koha › Stock rotation [% 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 %] - + [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] @@ -44,10 +45,10 @@ [% ELSIF (op == 'manage_stages') %] › Manage stages [% ELSIF (op == 'create_edit_stage' && stage.id) %] - › Manage stages + › Manage stages › Edit stage [% ELSIF (op == 'create_edit_stage' && !stage.id) %] - › Manage stages + › Manage stages › Create stage [% ELSIF (op == 'manage_items') %] › Manage items @@ -79,13 +80,13 @@ [% FOREACH rota IN existing_rotas %] - [% rota.title %] - [% rota.cyclical ? 'Yes' : 'No'%] - [% rota.active ? 'Yes' : 'No'%] - [% rota.description %] - [% rota.stockrotationitems.count %] + [% rota.title | html %] + [% rota.cyclical ? 'Yes' : 'No' | html %] + [% rota.active ? 'Yes' : 'No' | html %] + [% rota.description | html %] + [% rota.stockrotationitems.count | html %] - + Edit @@ -95,13 +96,13 @@
      -
    • Stages
      • +
    • Stages
      • [% IF CAN_user_stockrotation_manage_rota_items && rota.stockrotationstages.count > 0 %] -
    • Items
      • +
    • Items
      • [% END %]
    - + [% IF !rota.active %] Activate @@ -119,7 +120,7 @@ [% ELSIF (op == 'create_edit_rota') %] [% IF rota.rota_id %] -

    Edit "[% rota.title %]"

    +

    Edit "[% rota.title | html %]"

    [% ELSE %]

    Create new rota

    [% END %] @@ -135,7 +136,7 @@
    1. - + Required
    2. @@ -152,7 +153,7 @@
    3. - +
    @@ -161,7 +162,7 @@     Cancel [% IF rota.rota_id %] - + [% END %] @@ -176,7 +177,7 @@ [% END %] -

    Manage [% rota.title %] stages

    +

    Manage [% rota.title | html %] stages

    [% FOREACH branch IN branches %] [% IF branch.branchcode == stage.branchcode_id %] - + [% ELSE %] - + [% END %] [% END %] @@ -208,7 +209,7 @@
  • - + Required
    • @@ -216,8 +217,8 @@
    - - + + @@ -230,21 +231,21 @@ Library Duration (days)
    -