Bugzilla – Attachment 53739 Details for
Bug 16978
Add delete reports user permission
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16978: Add delete reports user permission
Bug-16978-Add-delete-reports-user-permission.patch (text/plain), 7.56 KB, created by
Mark Tompsett
on 2016-07-26 23:58:54 UTC
(
hide
)
Description:
Bug 16978: Add delete reports user permission
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2016-07-26 23:58:54 UTC
Size:
7.56 KB
patch
obsolete
>From f120f270ccd076bdf97009ae93869b66cdc7fc79 Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Tue, 26 Jul 2016 09:50:52 -0400 >Subject: [PATCH] Bug 16978: Add delete reports user permission > >This splits off the delete capability from the create reports permission. >From a UI perspective there were CSS issues, that this patch set hackily >bypasses. Perhaps someone else can amend this enhancement with the required >changes so that the extra column at the beginning of the table can be >removed when the user does not have delete capability. >--- > installer/data/mysql/atomicupdate/bug_16978.sql | 3 +++ > installer/data/mysql/userpermissions.sql | 1 + > koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc | 1 + > koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc | 2 +- > .../intranet-tmpl/prog/en/modules/help/members/member-flags.tt | 6 ++++++ > .../prog/en/modules/reports/guided_reports_start.tt | 10 ++++++++-- > reports/guided_reports.pl | 8 ++++++-- > 7 files changed, 26 insertions(+), 5 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/bug_16978.sql > >diff --git a/installer/data/mysql/atomicupdate/bug_16978.sql b/installer/data/mysql/atomicupdate/bug_16978.sql >new file mode 100644 >index 0000000..6d15c21 >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_16978.sql >@@ -0,0 +1,3 @@ >+INSERT IGNORE INTO `permissions` >+ (module_bit, code, description) VALUES >+ (16, 'delete_reports', 'Delete SQL reports'); >diff --git a/installer/data/mysql/userpermissions.sql b/installer/data/mysql/userpermissions.sql >index abeeb3a..26b4e5c 100644 >--- a/installer/data/mysql/userpermissions.sql >+++ b/installer/data/mysql/userpermissions.sql >@@ -68,6 +68,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (15, 'superserials', 'Manage subscriptions from any branch (only applies when IndependentBranches is used)'), > (16, 'execute_reports', 'Execute SQL reports'), > (16, 'create_reports', 'Create SQL reports'), >+ (16, 'delete_reports', 'Delete SQL reports'), > (18, 'manage_courses', 'Add, edit and delete courses'), > (18, 'add_reserves', 'Add course reserves'), > (18, 'delete_reserves', 'Remove course reserves'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >index 6a80ba1..bcff76b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >@@ -90,6 +90,7 @@ > [%- CASE 'renew_subscription' -%]<span>Renew a subscription</span> > [%- CASE 'routing' -%]<span>Routing</span> > [%- CASE 'superserials' -%]<span>Manage subscriptions from any branch (only applies when IndependentBranches is used)</span> >+ [%- CASE 'delete_reports' -%]<span>Delete SQL reports</span> > [%- CASE 'create_reports' -%]<span>Create SQL reports</span> > [%- CASE 'execute_reports' -%]<span>Execute SQL reports</span> > [%- CASE 'add_reserves' -%]<span>Add course reserves</span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >index 25f848a..232ddd3 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >@@ -25,7 +25,7 @@ > </div> > [% END %] > >- [% IF ( CAN_user_reports_create_reports ) %] >+ [% IF ( CAN_user_reports_delete_reports ) %] > <div class="btn-group"> > <a class="delete btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Delete%20Saved"> > <i class="fa fa-trash"></i> Delete >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt >index 974a215..b116e9e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt >@@ -499,6 +499,12 @@ > <p>If the staff member has 'reports' permissions they have the ability to perform all of these actions. If you would like to control reports permissions on a more granular level choose from these options:</p> > > <ul> >+ <li>delete_reports >+<ul> >+ <li>Delete SQL Reports</li> >+ <li>The ability to delete but not run SQL reports</li> >+</ul> >+</li> > <li>create_reports > <ul> > <li>Create SQL Reports</li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index bdf70fd..15703ad 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -335,7 +335,11 @@ canned reports and writing custom SQL reports.</p> > <tbody> > [% FOREACH savedreport IN savedreports %] > [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %] >- <td><input type="checkbox" name="ids" value="[% savedreport.id %]" /></td> >+ <td> >+ [% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS --> >+ <input type="checkbox" name="ids" value="[% savedreport.id %]" /> >+ [% END %] >+ </td> > <td><label for="ids">[% savedreport.id %]</label></td> > <td> > [% IF ( savedreport.report_name ) %] >@@ -371,7 +375,7 @@ canned reports and writing custom SQL reports.</p> > [% END %] > <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Run%20this%20report"><i class="fa fa-play"></i> Run</a></li> > <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="fa fa-clock-o"></i> Schedule</a></li> >- [% IF ( CAN_user_reports_create_reports ) %] >+ [% IF ( CAN_user_reports_delete_reports ) %] > <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a></li> > [% END %] > </ul> >@@ -381,9 +385,11 @@ canned reports and writing custom SQL reports.</p> > [% END %] > </tbody> > </table> >+ [% IF ( CAN_user_reports_delete_reports ) %] > <fieldset class="action"> > <input type="submit" value="Delete selected" /> > </fieldset> >+ [% END %] > </form> > </div> > </div> >diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl >index 75040f4..6be1acf 100755 >--- a/reports/guided_reports.pl >+++ b/reports/guided_reports.pl >@@ -51,12 +51,16 @@ my $usecache = C4::Context->ismemcached; > > my $phase = $input->param('phase') // ''; > my $flagsrequired; >-if ( $phase eq 'Build new' or $phase eq 'Delete Saved' ) { >+if ( $phase eq 'Build new' ) { > $flagsrequired = 'create_reports'; > } > elsif ( $phase eq 'Use saved' ) { > $flagsrequired = 'execute_reports'; >-} else { >+} >+elsif ( $phase eq 'Delete Saved' ) { >+ $flagsrequired = 'delete_reports'; >+} >+else { > $flagsrequired = '*'; > } > >-- >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 16978
:
53723
|
53739
|
53741
|
53864
|
53871
|
53887
|
53888