Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Fix for Bug 4909 - extra > in path on contracts pages

Browse source 
The logic for displaying a useful title did not take all
cases into account. This patch adds the missing case.

The patch also fixes problems with the "Cancel" link
on update and delete operations.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
This commit is contained in:
Owen Leonard 2010-06-25 09:48:20 -04:00 committed by Galen Charlton
parent 4d32d848e0
commit 6fa2b03097
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl
View file

@ -4,6 +4,7 @@
<!-- TMPL_IF NAME="contractnumber" -->Modify contract '<!-- TMPL_VAR NAME="contractname" -->'
<!-- TMPL_ELSE -->New contract<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="else" -->Contracts of <!-- TMPL_VAR NAME="booksellername" --><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="add_validate" -->Data recorded<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Contract '<!-- TMPL_VAR NAME="contractnumber" -->'<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="delete_confirmed" -->Contract Deleted<!-- /TMPL_IF --></title>
@ -167,7 +168,7 @@ function Check(ff) {
<input type="hidden" name="booksellerid" value="<!-- TMPL_VAR name="booksellerid" -->" />
<input type="hidden" name="contractnumber" value="<!-- TMPL_VAR NAME="contractnumber" -->" />
<input type="submit" value="Delete this Contract" />
<a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl">Cancel</a>
<a class="cancel" href="/cgi-bin/koha/admin/aqcontract.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->">Cancel</a>
</fieldset>
</fieldset>
</form>
@ -210,7 +211,7 @@ function Check(ff) {
<!-- TMPL_LOOP NAME="loop" -->
<!-- TMPL_IF NAME="__even__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
<td>
<a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->"><!-- TMPL_VAR NAME="contractname" --></a>
<a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&amp;contractnumber=<!-- TMPL_VAR NAME="contractnumber" -->"><!-- TMPL_VAR NAME="contractname" --></a>
</td>
<td><!-- TMPL_VAR NAME="contractdescription" --></td>
<td><!-- TMPL_VAR NAME="contractstartdate" --></td>