From 60ce16560711f9cead421e19dc7a569cf484c3b0 Mon Sep 17 00:00:00 2001 From: Owen Leonard <oleonard@myacpl.org> Date: Thu, 9 May 2013 15:08:41 -0400 Subject: [PATCH] [PASSED QA] Bug 10225 - If an item isn't editable, don't show the onclick Edit/Delete menu The user should not be shown edit/delete links when clicking on a row in additems which they cannot edit because of the IndependantBranches setting. This patch adds a class to the row to exclude such rows in the JavaScript onclick handler. To test: - Turn IndependantBranches on and edit items for a title which has holdings from various branches including your own. - Click a row for an item which is held by your library. You should see the "Edit/Delete" links appear. - Click a row for an item which is held by another library. No links should appear. Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com> All test pass Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> All tests and QA script pass. Changes to the templates include no string changes. --- .../prog/en/modules/cataloguing/additem.tt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt index 97d06a5..1043965 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt @@ -13,7 +13,7 @@ $(document).ready(function(){ $("fieldset.rows input").keydown(function(e){ return checkEnter(e); }); /* Inline edit/delete links */ var biblionumber = $("input[name='biblionumber']").attr("value"); - $("td").click(function(event){ + $("tr.editable td").click(function(event){ var $tgt = $(event.target); if($tgt.is("a")||$tgt.is(":first-child")||$tgt.is(":nth-child(2)")){ return true; } else { var rowid = $(this).parent().attr("id"); @@ -134,11 +134,19 @@ $(document).ready(function() { [% END %] </tr> [% FOREACH item_loo IN item_loop %] - [% IF ( item_loo.itemnumber == itemnumber) %] - <tr id="row[% item_loo.itemnumber %]" class="active"> - [% ELSE %] - <tr id="row[% item_loo.itemnumber %]"> - [% END %] + [% IF ( item_loo.itemnumber == itemnumber) %] + [% IF item_loo.nomod %] + <tr id="row[% item_loo.itemnumber %]" class="active"> + [% ELSE %] + <tr id="row[% item_loo.itemnumber %]" class="active editable"> + [% END %] + [% ELSE %] + [% IF item_loo.nomod %] + <tr id="row[% item_loo.itemnumber %]"> + [% ELSE %] + <tr id="row[% item_loo.itemnumber %]" class="editable"> + [% END %] + [% END %] [% IF ( item_loo.nomod ) %] <td colspan="2"> </td>[% ELSE %][% IF ( item_loo.hostitemflag ) %]<td><a href="additem.pl?op=edititem&biblionumber=[% item_loo.hostbiblionumber %]&itemnumber=[% item_loo.itemnumber %]#edititem">Edit in host</a></td> <td><a class="delete" href="/cgi-bin/koha/cataloguing/additem.pl?op=delinkitem&biblionumber=[% biblionumber %]&hostitemnumber=[% item_loo.itemnumber %]">Delink</a></td> [% ELSE %]<td><a href="additem.pl?op=edititem&biblionumber=[% biblionumber %]&itemnumber=[% item_loo.itemnumber %]#edititem">Edit</a></td> -- 1.7.9.5