gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for bug 1708 

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
This commit is contained in:
Chris Cormack 2007-12-30 19:23:30 -06:00 committed by Joshua Ferraro
parent 48b4d54408
commit fdda3d48d1
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
C4/Reserves.pm
View File

@ -1037,12 +1037,13 @@ sub _FixPriority {
# get whats left
# FIXME adding a new security in returned elements for changing priority,
# now, we don't care anymore any reservations with itemnumber linked (suppose a waiting reserve)
# This is wrong a waiting reserve has W set
# The assumption that having an itemnumber set means waiting is wrong and should be corrected any place it occurs
my $query = qq/
SELECT borrowernumber, reservedate, constrainttype
FROM reserves
WHERE biblionumber = ?
AND cancellationdate IS NULL
AND itemnumber IS NULL
AND ((found <> 'F' and found <> 'W') or found is NULL)
ORDER BY priority ASC
/;

21
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
View File

@ -306,17 +306,10 @@ if (alreadyreserved > "0"){
<select name="rank-request">
<!-- TMPL_IF Name="wait" -->
<option value="W" selected="selected">Waiting</option>
<!-- TMPL_ELSE -->
<!-- TMPL_IF Name="selected" -->
<option value="<!-- TMPL_VAR NAME="priority" -->" selected="selected">
<!-- TMPL_VAR NAME="priority" -->
</option>
<!-- TMPL_ELSE -->
<option value="<!-- TMPL_VAR NAME="priority" -->">
<!-- TMPL_VAR NAME="priority" -->
</option>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_LOOP Name="optionloop" -->
<option value="<!-- TMPL_VAR NAME="num" -->" <!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->><!-- TMPL_VAR NAME="num" --></option>
<!-- /TMPL_LOOP -->
<option value="del">del</option>
</select>
</td>
@ -329,12 +322,12 @@ if (alreadyreserved > "0"){
<!-- TMPL_IF Name="wait" -->
<!-- TMPL_IF NAME="atdestination" -->
<!-- TMPL_IF name="found" -->
Item waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcd" -->" />
Item waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcode" -->" />
<!-- TMPL_ELSE -->
Waiting to be pulled
<!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
Item being transfered to <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcd" -->" />
Item being transfered to <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcode" -->" />
<!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
<select name="pickup">
@ -373,7 +366,7 @@ if (alreadyreserved > "0"){
</tr>
<!-- /TMPL_LOOP --> <!-- existing reserveloop -->
</table>
<fieldset class="action"><input type="submit" name="submit" value="Cancel hold(s)" /></fieldset>
<fieldset class="action"><input type="submit" name="submit" value="Update hold(s)" /></fieldset>
</fieldset>
</form>
<!-- /TMPL_IF -->