Owen Leonard
cd089028b8
The page for adding a new basket in Acquisitions includes some custom form validation JavaScript which can be removed in favor of HTML5 validation attributes and Koha's built-in validation plugin. This patch does so. To test, apply the patch and go to Acquisitions -> Choose a vendor -> New basket. Try submitting the form without entering a basket name. This should trigger a validation warning. Submission of the form with valid data should work correctly. Editing an existing basket should also work correctly. Patch works as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works as expected, passes all tests and QA script. Tried adding a new basket with/without basket name and editing an existing basket editing/emptying the basket name. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
128 lines
5.8 KiB
Text
128 lines
5.8 KiB
Text
[% INCLUDE 'doc-head-open.inc' %]
|
|
<title>Koha › Acquisitions ›
|
|
[% IF ( add_form ) %]
|
|
[% IF ( basketno ) %]Edit basket '[% basketname %]'
|
|
[% ELSE %]Add a basket to [% booksellername %]
|
|
[% END %]
|
|
[% END %]
|
|
</title>
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
<script type="text/javascript" src="[% themelang %]/js/acq.js"></script>
|
|
</head>
|
|
<body id="acq_basketheader" class="acq">
|
|
[% INCLUDE 'header.inc' %]
|
|
[% INCLUDE 'acquisitions-search.inc' %]
|
|
|
|
<div id="breadcrumbs">
|
|
<a href="/cgi-bin/koha/mainpage.pl">Home</a> ›
|
|
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> ›
|
|
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername %]</a> ›
|
|
[% IF ( add_form ) %]
|
|
[% IF ( basketno ) %]Edit basket '[% basketname %]'
|
|
[% ELSE %]Add a basket to [% booksellername %]
|
|
[% END %]
|
|
[% END %]
|
|
</div>
|
|
|
|
<div id="doc" class="yui-t7">
|
|
<div id="bd">
|
|
|
|
<div id="yui-main">
|
|
|
|
[% IF ( add_form ) %]
|
|
[% IF ( basketno ) %]
|
|
<h1>Edit basket [% basketname %]</h1>
|
|
[% ELSE %]<h1>Add a basket to [% booksellername %]</h1>
|
|
[% END %]
|
|
<form name="Aform" action="[% script_name %]" method="post" class="validated">
|
|
<input type="hidden" name="booksellerid" value="[% booksellerid %]" />
|
|
<fieldset class="rows">
|
|
<ol>
|
|
[% IF ( basketno ) %]
|
|
<li>
|
|
<input type="hidden" name="basketno" value="[% basketno %]" />
|
|
<input type="hidden" name="is_an_edit" value="1" />
|
|
</li>
|
|
[% END %]
|
|
<li>
|
|
<label for="basketname" class="required">Basket name: </label>
|
|
<input type="text" name="basketname" id="basketname" size="40" maxlength="80" value="[% basketname %]" required="required" class="required" />
|
|
<span class="required">Required</span>
|
|
</li>
|
|
<li>
|
|
<label for="billingplace">Billing place:</label>
|
|
<select name="billingplace" id="billingplace">
|
|
<option value="">--</option>
|
|
[% FOREACH billingplace IN billingplaceloop %]
|
|
[% IF ( billingplace.selected ) %]
|
|
<option value="[% billingplace.value %]" selected="selected">
|
|
[% ELSE %]
|
|
<option value="[% billingplace.value %]">
|
|
[% END %]
|
|
[% billingplace.branchname %]
|
|
</option>
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
<li>
|
|
<label for="deliveryplace">Delivery place:</label>
|
|
<select name="deliveryplace" id="deliveryplace">
|
|
<option value="">--</option>
|
|
[% FOREACH deliveryplace IN deliveryplaceloop %]
|
|
[% IF ( deliveryplace.selected ) %]
|
|
<option value="[% deliveryplace.value %]" selected="selected">
|
|
[% ELSE %]
|
|
<option value="[% deliveryplace.value %]">
|
|
[% END %]
|
|
[% deliveryplace.branchname %]
|
|
</option>
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
<li>
|
|
<label for="basketbooksellerid">Vendor: </label>
|
|
<select name="basketbooksellerid" id="basketbooksellerid">
|
|
[% FOREACH b IN booksellers %]
|
|
[% IF booksellerid == b.id %]
|
|
<option value="[% b.id %]" selected="selected">[% b.name %]</option>
|
|
[% ELSE %]
|
|
<option value="[% b.id %]">[% b.name %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
<li>
|
|
<label for="basketnote">Internal note: </label>
|
|
<textarea name="basketnote" id="basketnote" rows="5" cols="40">[% basketnote %]</textarea>
|
|
</li>
|
|
<li>
|
|
<label for="basketbooksellernote">Vendor note: </label>
|
|
<textarea name="basketbooksellernote" id="basketbooksellernote" rows="5" cols="40">[% basketbooksellernote %]</textarea>
|
|
</li>
|
|
[% IF ( contractloop ) %]
|
|
<li><label for="basketcontractnumber">Contract: </label>
|
|
<select id="basketcontractnumber" name="basketcontractnumber">
|
|
<option value=""></option>
|
|
[% FOREACH contractloo IN contractloop %]
|
|
[% IF ( contractloo.selected ) %]
|
|
<option value="[% contractloo.contractnumber %]" selected="selected">[% contractloo.contractname %]</option>
|
|
[% ELSE %]
|
|
<option value="[% contractloo.contractnumber %]">[% contractloo.contractname %]</option>
|
|
[% END %]
|
|
[% END %]
|
|
</select>
|
|
</li>
|
|
[% END %]
|
|
</ol>
|
|
</fieldset>
|
|
<fieldset class="action">
|
|
<input type="hidden" name="op" value="add_validate" />
|
|
<input type="submit" value="Save" />
|
|
<a class="cancel" href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">Cancel</a>
|
|
</fieldset>
|
|
</form>
|
|
[% END %]
|
|
</div>
|
|
</div>
|
|
|
|
[% INCLUDE 'intranet-bottom.inc' %]
|