From f421f4650366f4d1fed61f12152f00491fa252b5 Mon Sep 17 00:00:00 2001 From: Liz Rea Date: Wed, 28 Sep 2011 09:04:14 -0500 Subject: [PATCH] Bug 6323 -- Error handling cleanup for moveitem.tt Content-Type: text/plain; charset="utf-8" Added button to retry attaching item, added default bib view handling, cosmetic changes to the error display (buttons now in error div). incorporates changes that should satisfy QA. To test: Find a bib with multiple items and grab one of the barcodes. Go to a second bib and click Edit -> Attach item Paste your barcode in there and click "Submit" Click the "Try again with a different barcode" button. It should take you back to the barcode entry screen. Also try with a non-existent barcode and verify that the button appears and works as intended. --- .../prog/en/modules/cataloguing/moveitem.tt | 83 +++++++++++++------- 1 files changed, 55 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt index 553d130..792476f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt @@ -5,46 +5,73 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'cat-search.inc' %] -

Home › Cataloging › Attach an item to [% bibliotitle |html %]

+

Home › Cataloging › Attach an item to [% bibliotitle |html %][% IF ( itemsloo.subtitle ) %][% itemsloo.subtitle %][% END %]

+[% BLOCK actions %] + [% IF ( BiblioDefaultViewmarc ) %] + + +[% END %] + [% IF ( error ) %]

- [% IF ( errornonewitem ) %]ERROR: Unable to create the new item.[% END %] - [% IF ( errornoitem ) %]ERROR: Unable to get the item.[% END %] - [% IF ( errornoitemnumber ) %]ERROR: Unable to get the item number from this barcode.[% END %] +

+ [% IF ( errornonewitem ) %]ERROR: Unable to create the new item.

+ [% INCLUDE actions %] + [% INCLUDE fail %] + + [% END %] + + [% IF ( errornoitem ) %]ERROR: Unable to get the item.

+ [% INCLUDE actions %] + [% INCLUDE fail %] + [% END %] + + [% IF ( errornoitemnumber ) %]ERROR: Unable to get the item number from this barcode.

+ [% INCLUDE actions %] + [% INCLUDE fail %] + [% END %] +

- -[% ELSE %] - [% IF ( success ) %] -

The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %][% bibliotitle |html %].[% IF ( BiblioDefaultViewmarc ) %] - - -

+ [% ELSE %] + [% IF ( success ) %] +

The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %][% bibliotitle |html %]. +

+ [% INCLUDE actions %] + + + +

+

+

[% ELSE %] [% IF ( missingparameter ) %]