Bugzilla – Attachment 3210 Details for
Bug 5804
duplicate warning when ordering needs design work
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed fix
0001-Fix-for-Bug-5804-duplicate-warning-when-ordering-nee.patch (text/plain), 5.42 KB, created by
Owen Leonard
on 2011-02-24 19:38:36 UTC
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2011-02-24 19:38:36 UTC
Size:
5.42 KB
patch
obsolete
>From 6651941f189361b7521c0c5e2931c671075ed143 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Thu, 24 Feb 2011 10:56:42 -0500 >Subject: [PATCH] Fix for Bug 5804 - duplicate warning when ordering needs design work >Content-Type: text/plain; charset="utf-8" > >--- > .../en/modules/acqui/neworderempty_duplicate.tmpl | 60 +++++++++++++++----- > 1 files changed, 45 insertions(+), 15 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tmpl >index c85f40f..7203526 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tmpl >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tmpl >@@ -1,11 +1,6 @@ > <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --> > <title>Koha › Acquisitions › Basket <!-- TMPL_VAR NAME="basketno" --> › Duplicate warning</title> > <!-- TMPL_INCLUDE NAME="doc-head-close.inc" --> >- >-<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/acq.js"></script> >-<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/additem.js"></script> >-<script type="text/javascript"> >-</script> > </head> > <body> > >@@ -20,19 +15,54 @@ > <div id="yui-main"> > <div class="yui-b"> > >-<h2>Duplicate warning</h2> >+<div class="dialog alert"> >+<h4>Duplicate warning</h4> >+<p>You selected a record from an external source that matches an existing record in your catalog: <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="popup" target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"> >+<!-- TMPL_ELSIF NAME="BiblioDefaultViewlabeled_marc" --><a class="popup" target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"> >+<!-- TMPL_ELSIF NAME="BiblioDefaultViewisbd" --><a class="popup" target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"> >+<!-- TMPL_ELSE --><a class="popup" target="_blank" title="Open in new window" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="duplicatetitle" --></a></p> >+</div> > >-<p>You selected a record from an external source that matches an existing record in your catalog!</p> >-<p>Click Use Existing if you do not want to create a duplicate record, but you want to add an order from the existing record in your catalog. Click Create New if you still want to create a new record by importing the external (duplicate) record. Click Cancel to return to the basket without making a new order.</p> >-<p>The existing catalog record can be viewed in a new window by clicking <a target="_blank" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="duplicatetitle" --></a> >+<div class="yui-gb"> >+<div class="yui-u first"> >+<div style="border: 1px solid #DDD; padding:1em;"> >+<form action="/cgi-bin/koha/acqui/neworderempty.pl"> >+<h4>Use existing record</h4> >+<p>Do not create a duplicate record. Add an order from the existing record in your catalog.</p> >+<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" /> >+<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" /> >+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> >+<input type="submit" value="Use Existing" /> >+</form> >+</div> >+</div> > >-<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" id="Aform"> >- <fieldset class="action"> >- <input type="button" value="Use Existing" onclick="window.location='/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'" /> >- <input type="button" value="Create New" onclick="window.location='/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&breedingid=<!-- TMPL_VAR NAME="breedingid" -->&use_external_source=1'" /> >- <input type="button" value="Cancel" onclick="window.location='/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->'" /> >- </fieldset> >+<div class="yui-u"> >+<div style="border: 1px solid #DDD; padding:1em;"> >+<form action="/cgi-bin/koha/acqui/basket.pl"> >+<h4>Cancel and return to order</h4> >+<p>Return to the basket without making a new order.</p> >+<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" /> >+<input type="submit" value="Cancel" /> > </form> >+</div> >+</div> >+ >+<div class="yui-u"> >+<div style="border: 1px solid #DDD; padding:1em;"> >+<form action="/cgi-bin/koha/acqui/neworderempty.pl"> >+<h4>Crete new record</h4> >+<p>Create a new record by importing the external (duplicate) record.</p> >+<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR NAME="booksellerid" -->" /> >+<input type="hidden" name="basketno" value="<!-- TMPL_VAR NAME="basketno" -->" /> >+<input type="hidden" name="breedingid" value="<!-- TMPL_VAR NAME="breedingid" -->" /> >+<input type="hidden" name="use_external_source" value="1" /> >+<input type="submit" value="Create New" /> >+</form> >+</div> >+</div> >+ >+</div> > > </div> > </div> >-- >1.7.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5804
:
3207
| 3210 |
3225