Attachment 4072 Details for Bug 6323 – This patch replaces the other one

[patch] This patch replaces the other one

0001-Bug-6323-Error-handling-cleanup-for-moveitem.tt.patch (text/plain), 6.68 KB, created by Liz Rea on 2011-05-10 20:20:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Liz Rea

Created: 2011-05-10 20:20:57 UTC

Size: 6.68 KB

patch

obsolete

>From 4f5a8f076c4fb41351c31858326c1d3af85c4253 Mon Sep 17 00:00:00 2001
>From: Liz Rea <lrea@nekls.org>
>Date: Tue, 10 May 2011 14:27:29 -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).
>---
> .../prog/en/modules/cataloguing/moveitem.tt        |  105 +++++++++++++++-----
> 1 files changed, 81 insertions(+), 24 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 4956f18..2c1afd7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt
>@@ -5,33 +5,90 @@
> <body>
> [% 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/cataloging/addbooks.pl">Cataloging</a>  &rsaquo; Attach an item to <i>[% bibliotitle |html %]</i></div>
>+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/cataloging/addbooks.pl">Cataloging</a>  &rsaquo; Attach an item to <i>[% bibliotitle |html %][% IF ( itemsloo.subtitle ) %][% itemsloo.subtitle %][% END %]</i></div>
> <div id="doc" class="yui-t7">
> 
> [% IF ( error ) %]
>     <div class="dialog alert">
>-	[% 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 %]
>-    </div>
>-    <form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
>-	<input type="submit" value="OK" />
>-	<input type="hidden" name="biblionumber" value="[% biblionumber %]" />
>-    </form>
>-[% ELSE %]
>-    [% IF ( success ) %]
>-	<div class="dialog message">The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %]<i>[% bibliotitle |html %]</i></a>.[% IF ( BiblioDefaultViewmarc ) %]
>-	<form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
>-[% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
>-	<form action="/cgi-bin/koha/catalogue/labeledMARCdetail.pl" method="post">
>-[% ELSIF ( BiblioDefaultViewisbd ) %]
>-	<form action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="post">
>-[% ELSE %]
>-	<form action="/cgi-bin/koha/catalogue/detail.pl" method="post">
>-[% END %]
>-	    <input type="submit"  class="approve" value="OK" />
>-	    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
>-	</form></div>
>+		[% IF ( errornonewitem ) %]ERROR: Unable to create the new item.<p>
>+
>+			[% IF ( BiblioDefaultViewmarc ) %]
>+				<form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
>+			[% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
>+				<form action="/cgi-bin/koha/catalogue/labeledMARCdetail.pl" method="post">
>+			[% ELSIF ( BiblioDefaultViewisbd ) %]
>+				<form action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="post">
>+			[% ELSE %]
>+				<form action="/cgi-bin/koha/catalogue/detail.pl" method="post">
>+			[% END %]
>+				<input type="submit"  value="OK" />
>+				<input type="hidden" name="biblionumber" value="[% biblionumber %]" />
>+			</form>
>+				<form method="link" action="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]"/>
>+				<input type="submit" class="new" value="Attach Item"/>
>+				<input type="hidden" name="biblionumber" value="[% biblionumber %]" />
>+			</form>
>+		</div>
>+		[% END %]
>+
>+		[% IF ( errornoitem ) %]ERROR: Unable to get the item.<p>
>+
>+			[% IF ( BiblioDefaultViewmarc ) %]
>+				<form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
>+			[% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
>+				<form action="/cgi-bin/koha/catalogue/labeledMARCdetail.pl" method="post">
>+			[% ELSIF ( BiblioDefaultViewisbd ) %]
>+				<form action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="post">
>+			[% ELSE %]
>+				<form action="/cgi-bin/koha/catalogue/detail.pl" method="post">
>+			[% END %]
>+				<input type="submit" value="OK" />
>+			    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
>+			</form>
>+				<form method="link" action="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]"/>
>+				<input type="submit" class="new" value="Attach Item"/>
>+				<input type="hidden" name="biblionumber" value="[% biblionumber %]" />
>+			</form>
>+		</div>
>+		[% END %]
>+
>+		[% IF ( errornoitemnumber ) %]ERROR: Unable to get the item number from this barcode.<p>
>+
>+			[% IF ( BiblioDefaultViewmarc ) %]
>+				<form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
>+			[% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
>+				<form action="/cgi-bin/koha/catalogue/labeledMARCdetail.pl" method="post">
>+			[% ELSIF ( BiblioDefaultViewisbd ) %]
>+				<form action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="post">
>+			[% ELSE %]
>+				<form action="/cgi-bin/koha/catalogue/detail.pl" method="post">
>+			[% END %]
>+				<input type="submit" value="OK" />
>+				<input type="hidden" name="biblionumber" value="[% biblionumber %]" />
>+			</form>
>+				<form method="link" action="/cgi-bin/koha/cataloguing/moveitem.pl?biblionumber=[% biblionumber %]"/>
>+				<input type="submit" class="new" value="Attach Item"/>
>+				<input type="hidden" name="biblionumber" value="[% biblionumber %]" />
>+			</form>
>+		</div>
>+		[% END %]
>+
>+	[% ELSE %]
>+	    [% IF ( success ) %]
>+			<div class="dialog message">The item has successfully been attached to [% INCLUDE 'biblio-default-view.inc' %]<i>[% bibliotitle |html %]</i></a>.
>+		[% IF ( BiblioDefaultViewmarc ) %]
>+			<form action="/cgi-bin/koha/catalogue/MARCdetail.pl" method="post">
>+		[% ELSIF ( BiblioDefaultViewlabeled_marc ) %]
>+			<form action="/cgi-bin/koha/catalogue/labeledMARCdetail.pl" method="post">
>+		[% ELSIF ( BiblioDefaultViewisbd ) %]
>+			<form action="/cgi-bin/koha/catalogue/ISBDdetail.pl" method="post">
>+		[% ELSE %]
>+			<form action="/cgi-bin/koha/catalogue/detail.pl" method="post">
>+		[% END %]
>+		    <input type="submit"  class="approve" value="OK" />
>+			<input type="hidden" name="biblionumber" value="[% biblionumber %]" />
>+		</form>
>+	</div>
> 
>     [% ELSE %]
> 	[% IF ( missingparameter ) %]
>@@ -39,7 +96,7 @@
> 	    [% IF ( missingbiblionumber ) %]
> 	    <fieldset id="biblionumber_fieldset">
> 		<label for="biblionumber">Select the biblionumber to attach the item to</label>
>-		    <div class="hint">Enter biblionumber:</div>
>+			<div class="hint">Enter biblionumber:</div>
> 		    <input type="text" name="biblionumber" id="biblionumber" class="focus" size="14" />
> 		    <fieldset class="action"><input type="submit" value="Submit" /></fieldset>
> 	    </fieldset>
>-- 
>1.5.6.5
>

Actions: View | Diff | Splinter Review

Attachments on bug 6323: 4064 | 4072 | 5628 | 6249 | 6331 | 6332 | 6870 | 6872 | 6874 | 6875 | 6908 | 6927