From b86e6fdeb73bf8c3ec656cc704878143f903c216 Mon Sep 17 00:00:00 2001 From: Aleisha Date: Tue, 1 Mar 2016 23:09:39 +0000 Subject: [PATCH] Bug 15952: Moving cataloging search actions into a drop-down menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Edit: Have removed the datatables stuff - wasn't necessary. Also fixed a merge conflict To test: 1) Go to Cataloging and do a search in the catalog and reservoir (cataloguing/addbooks.pl) 2) Confirm that for the results found in catalog, the options (MARC and Card preview, Edit biblio, Add/edit items) are there and behave as expected. 3) Confirm that for the results found in reservoir, the options (MARC and Card preview, Add biblio) are there and behave as expected. 4) Set user permissions so that the user cannot edit the catalog or items. (editcatalogue -> edit_catalogue and edit_items) 5) Confirm that you no longer see the options to edit or add items/biblio in either table. Sponsored-by: Catalyst IT Signed-off-by: Frédéric Demians Expected result following the test plan. --- .../prog/en/modules/cataloguing/addbooks.tt | 51 ++++++++++++++------ 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index 7423430..52f9d3c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -137,12 +137,14 @@   Title Location - Preview - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] [% ELSE %][% END %] - [% IF ( CAN_user_editcatalogue_edit_items ) %] [% END %] +   - [% FOREACH resultsloo IN resultsloop %] - + [% FOREACH resultsloo IN resultsloop %] + [% IF ( loop.even ) %] + + [% ELSE %] + + [% END %]

@@ -195,10 +197,19 @@ [% IF ( resultsloo.notforloancount ) %] Not for loan ([% resultsloo.notforloancount %])[% END %] - MARC | Card + +

+ + Actions + + +
- [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]Edit biblio[% END %] - [% IF ( CAN_user_editcatalogue_edit_items ) %]Add/Edit items[% END %] [% END %] @@ -223,8 +234,7 @@ Date Edition Coming from - Preview - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] [% END %] +   [% FOREACH breeding_loo IN breeding_loop %] @@ -234,12 +244,21 @@ [% breeding_loo.copyrightdate %] [% breeding_loo.edition %] [% breeding_loo.file %] - MARC | Card - - [% IF ( CAN_user_editcatalogue_edit_catalogue ) %] - Add biblio - [% END %] - + +
+ + Actions + + +
+ + [% END %] [% ELSE %] -- 1.7.10.4