Bugzilla – Attachment 50089 Details for
Bug 16231
Correct permission handling in subscription edit menu
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16231 - Correct permission handling in subscription edit menu
Bug-16231---Correct-permission-handling-in-subscri.patch (text/plain), 6.03 KB, created by
Owen Leonard
on 2016-04-08 18:47:26 UTC
(
hide
)
Description:
Bug 16231 - Correct permission handling in subscription edit menu
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2016-04-08 18:47:26 UTC
Size:
6.03 KB
patch
obsolete
>From 5ef7e692031ba484394b09742870c90d5e662fa0 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Fri, 8 Apr 2016 14:46:21 -0400 >Subject: [PATCH] Bug 16231 - Correct permission handling in subscription edit > menu >Content-Type: text/plain; charset="utf-8" > >This patch corrects the way subscription edit menu items are displayed >according to the user's permissions settings. The edit menu has been >updated to use the menu item terms "Edit," "Duplicate," and "Delete" >instead of "Edit subscription," "Edit as new (duplicate)", and "Delete >subscription. The change makes the terms less redundant and more >consistent with other similar menus in Koha. Font Awesome icons have >been added to each menu item. > >This patch also removes a non-standard "fa-lg" class from some Font >Awesome icons in the toolbar. > >To test, apply the patch and log in to the staff client as a user who >has permission to create, edit, and delete subscriptions. > >- Locate an subscription and view the details for it. >- The "Edit" menu should show three options: "Edit," "Duplicate," and > "Delete." >- Confirm that each menu item works correctly. >- Repeat the process when logged in as a user with varying combinations > of create, edit, and delete permissions. >--- > .../prog/en/includes/serials-toolbar.inc | 31 +++++++++++++--------- > 1 file changed, 18 insertions(+), 13 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >index 2581be2..b79dd45 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc >@@ -39,9 +39,9 @@ > <div id="toolbar" class="btn-toolbar"> > [% IF CAN_user_serials_create_subscription %] > [% IF biblionumber_for_new_subscription %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus fa-lg"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus"></i> New subscription</a></div> > [% ELSE %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus fa-lg"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div> > [% END %] > [% END %] > >@@ -50,16 +50,21 @@ > <div class="btn-group"> > <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="fa fa-pencil"></i> Edit <span class="caret"></span></button> > <ul class="dropdown-menu"> >- [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %] >- <li> [% END %] >- <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=[% subscriptionid %]">Edit subscription</a></li> >- [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %] >- <li> [% END %] >- <a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&subscriptionid=[% subscriptionid %]">Edit as new (duplicate)</a></li> >+ [% IF ( CAN_user_serials_edit_subscription ) %] >+ <li> >+ <a href="/cgi-bin/koha/serials/subscription-add.pl?op=modify&subscriptionid=[% subscriptionid %]"><i class="fa fa-pencil"></i> Edit</a> >+ </li> >+ [% END %] >+ [% IF ( CAN_user_serials_create_subscription ) %] >+ <li> >+ <a href="/cgi-bin/koha/serials/subscription-add.pl?op=dup&subscriptionid=[% subscriptionid %]"><i class="fa fa-copy"></i> Duplicate</a> >+ </li> >+ [% END %] > [% IF ( CAN_user_serials_delete_subscription ) %] >- [% IF ( cannotedit ) %] <li class="disabled"> [% ELSE %] >- <li> [% END %] >- <a href="#" id="deletesub">Delete subscription</a></li>[% END %] >+ <li> >+ <a href="#" id="deletesub"><i class="fa fa-trash"></i> Delete</a> >+ </li> >+ [% END %] > </ul> > </div> > [% END %] >@@ -84,9 +89,9 @@ > [% ELSIF CAN_user_serials_create_subscription %] > <div id="toolbar" class="btn-toolbar"> > [% IF ( biblionumber_for_new_subscription ) %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus fa-lg"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl?biblionumber_for_new_subscription=[% biblionumber_for_new_subscription %]"><i class="fa fa-plus"></i> New subscription</a></div> > [% ELSE %] >- <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus fa-lg"></i> New subscription</a></div> >+ <div class="btn-group"><a id="newsubscription" class="btn btn-small" href="/cgi-bin/koha/serials/subscription-add.pl"><i class="fa fa-plus"></i> New subscription</a></div> > [% END %] > </div> > [% END %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16231
:
50089
|
50195
|
50639
|
50711
|
79904
|
82336
|
83833
|
84680