From 2d41590d4c454cbf891bff9e9bd1070b8364422a Mon Sep 17 00:00:00 2001 From: NguyenDuyTinh Date: Fri, 10 Jun 2016 10:14:12 +0000 Subject: [PATCH] [PASSED QA] Bug 16705 - Add missing status to serials history in OPAC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The bug is related to 10851. Due to add of status in 10851, status added were missing in opac-detail.tt and opac-full-serial-issues.tt. The patch just added these missing status. To test: 1) Create New subscription in Serials, in Intranet 2) Do a search of the new subscription by Title 3) Take Serial receive as Actions to edit the status to Missing () 4) Go to Opac and Search the subscription created, by its title and See missing status 5) Apply patch, status must be showed. 6) Sign off Followed test plan, works as expected. Amended to format commit title and message. Signed-off-by: Marc VĂ©ron Signed-off-by: Katrin Fischer --- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 31 +++++++++------------- .../en/modules/opac-full-serial-issues.tt | 4 +++ 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index fe72d01..10619b0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -832,25 +832,18 @@ [% latestserial.serialseq %] [% latestserial.planneddate %] - [% IF ( latestserial.status1 ) %] - Awaited - [% ELSE %] - [% IF ( latestserial.status2 ) %] - Arrived - [% ELSE %] - [% IF ( latestserial.status3 ) %] - Late - [% ELSE %] - [% IF ( latestserial.status4 ) %] - Missing - [% ELSE %] - [% IF ( latestserial.status5 ) %] - Not issued - [% END %] - [% END %] - [% END %] - [% END %] - [% END %] + [% IF (latestserial.status1 ) %]Expected[% END %] + [% IF (latestserial.status2 ) %]Arrived[% END %] + [% IF (latestserial.status3 ) %]Late[% END %] + [% IF (latestserial.status4 ) %]Missing[% END %] + [% IF (latestserial.status41 ) %]Missing (never received)[% END %] + [% IF (latestserial.status42 ) %]Missing (sold out)[% END %] + [% IF (latestserial.status43 ) %]Missing (damaged)[% END %] + [% IF (latestserial.status44 ) %]Missing (lost)[% END %] + [% IF (latestserial.status5 ) %]Not issued[% END %] + [% IF (latestserial.status6 ) %]Delete[% END %] + [% IF (latestserial.status7 ) %]Claimed[% END %] + [% IF (latestserial.status8 ) %]Stopped[% END %] [% latestserial.notes %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt index dbe1e11..d538e55 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt @@ -112,6 +112,10 @@ [% IF ( serial.status2 ) %]Arrived[% END %] [% IF ( serial.status3 ) %]Late[% END %] [% IF ( serial.status4 ) %]Missing[% END %] + [% IF ( serial.status41 ) %]Missing (never received)[% END %] + [% IF ( serial.status42 ) %]Missing (sold out)[% END %] + [% IF ( serial.status43 ) %]Missing (damaged)[% END %] + [% IF ( serial.status44 ) %]Missing (lost)[% END %] [% IF ( serial.status5 ) %]Not available[% END %] [% IF ( serial.status6 ) %]Delete[% END %] [% IF ( serial.status7 ) %]Claimed[% END %] -- 1.9.1