Attachment 49213 Details for Bug 15952 – Bug 15952: Moving cataloging search actions into a drop-down menu

[patch] Bug 15952: Moving cataloging search actions into a drop-down menu

Bug-15952-Moving-cataloging-search-actions-into-a-.patch (text/plain), 6.79 KB, created by Jonathan Druart on 2016-03-16 11:10:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-03-16 11:10:08 UTC

Size: 6.79 KB

patch

obsolete

>From fc2d737961f2f70b7ea080c8d0d02117c40d9a83 Mon Sep 17 00:00:00 2001
>From: Aleisha <aleishaamohia@hotmail.com>
>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
>Edit: Comment 7
>
>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 <f.demians@tamil.fr>
>  Expected result following the test plan.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../prog/en/modules/cataloguing/addbooks.tt        | 46 ++++++++++++++--------
> 1 file changed, 30 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 88d58ee..04e76da 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,9 @@
>             <th>&nbsp;</th>
>             <th>Title</th>
>             <th>Location</th>
>-            <th>Preview</th>
>-            [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<th>&nbsp;</th>[% ELSE %][% END %]
>-            [% IF ( CAN_user_editcatalogue_edit_items ) %]<th>&nbsp;</th>[% END %]
>+            <th>&nbsp;</th>
>         </tr>
>-    [% FOREACH resultsloo IN resultsloop %]
>-        <tr>
>+      [% FOREACH resultsloo IN resultsloop %]
>             <td><input type="checkbox" class="selection" id="bib[% resultsloo.biblionumber %]" name="biblionumber" value="[% resultsloo.biblionumber %]" /></td>
>             <td>
>                 <p>
>@@ -195,10 +192,19 @@
>                         [% IF ( resultsloo.notforloancount ) %] Not for loan ([% resultsloo.notforloancount %])[% END %]
>                     </span>
>                 </td>
>-                    <td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% resultsloo.biblionumber %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% resultsloo.biblionumber %]" class="previewData">Card</a>
>+                <td>
>+                  <div class="dropdown">
>+                    <a class="btn btn-mini dropdown-toggle" id="cataloguesearchactions[% resultsloo.biblionumber %]" role="button" data-toggle="dropdown" href="#">
>+                      Actions <b class="caret"></b>
>+                    </a>
>+                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% resultsloo.biblionumber %]">
>+                      <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% resultsloo.biblionumber %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
>+                      <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;id=[% resultsloo.biblionumber %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
>+                      [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% resultsloo.biblionumber %]"><i class="fa fa-pencil"></i> Edit biblio</a></li>[% END %]
>+                      [% IF ( CAN_user_editcatalogue_edit_items ) %]<li><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% resultsloo.biblionumber %]"><i class="fa fa-plus"></i> Add/Edit items</a></li>[% END %]
>+                    </ul>
>+                  </div>
>                 </td>
>-                [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<td><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% resultsloo.biblionumber %]">Edit biblio</a></td>[% END %]
>-                [% IF ( CAN_user_editcatalogue_edit_items ) %]<td><a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=[% resultsloo.biblionumber %]">Add/Edit items</a></td>[% END %]
>             </tr>
>     [% END %]
>     </table>
>@@ -223,8 +229,7 @@
>                 <th>Date</th>
>                 <th>Edition</th>
>                 <th>Coming from</th>
>-                <th>Preview</th>
>-                [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<th>&nbsp;</th>[% END %]
>+                <th>&nbsp;</th>
>             </tr>
>             [% FOREACH breeding_loo IN breeding_loop %]
>                <tr>
>@@ -234,12 +239,21 @@
>                 <td>[% breeding_loo.copyrightdate %]</td>
>                 <td>[% breeding_loo.edition %]</td>
>                 <td>[% breeding_loo.file %]</td>
>-                <td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id %]" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.id %]" class="previewData">Card</a>
>-                    </td>
>-                [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]<td>
>-                    <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id %]">Add biblio</a>
>-                </td>[% END %]
>-            </tr>
>+                <td>
>+                  <div class="dropdown">
>+                    <a class="btn btn-mini dropdown-toggle" id="reservoirsearchactions[% breeding_loo.id %]" role="button" data-toggle="dropdown" href="#">
>+                      Actions <b class="caret"></b>
>+                    </a>
>+                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="reservoirsearchactions[% breeding_loo.id %]">
>+                      <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id %]" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
>+                      <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.id %]" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
>+                      [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
>+                        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id %]"><i class="fa fa-plus"></i> Add biblio</a></li>
>+                      [% END %]
>+                    </ul>
>+                  </div>
>+               </td>
>+               </tr>
>             [% END %]
>         </table>
>     [% ELSE %]
>-- 
>2.7.0

Actions: View | Diff | Splinter Review

Attachments on bug 15952: 48529 | 48537 | 48566 | 48567 | 49058 | 49153 | 49213 | 49214