View | Details | Raw Unified | Return to bug 16978
Collapse All | Expand All

(-)a/installer/data/mysql/atomicupdate/bug_16978.sql (+3 lines)
Line 0 Link Here
1
INSERT IGNORE INTO `permissions`
2
    (module_bit, code,             description) VALUES
3
    (16,         'delete_reports', 'Delete SQL reports');
(-)a/installer/data/mysql/userpermissions.sql (+1 lines)
Lines 68-73 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
68
   (15, 'superserials', 'Manage subscriptions from any branch (only applies when IndependentBranches is used)'),
68
   (15, 'superserials', 'Manage subscriptions from any branch (only applies when IndependentBranches is used)'),
69
   (16, 'execute_reports', 'Execute SQL reports'),
69
   (16, 'execute_reports', 'Execute SQL reports'),
70
   (16, 'create_reports', 'Create SQL reports'),
70
   (16, 'create_reports', 'Create SQL reports'),
71
   (16, 'delete_reports', 'Delete SQL reports'),
71
   (18, 'manage_courses', 'Add, edit and delete courses'),
72
   (18, 'manage_courses', 'Add, edit and delete courses'),
72
   (18, 'add_reserves', 'Add course reserves'),
73
   (18, 'add_reserves', 'Add course reserves'),
73
   (18, 'delete_reserves', 'Remove course reserves'),
74
   (18, 'delete_reserves', 'Remove course reserves'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (+1 lines)
Lines 90-95 Link Here
90
    [%- CASE 'renew_subscription' -%]<span>Renew a subscription</span>
90
    [%- CASE 'renew_subscription' -%]<span>Renew a subscription</span>
91
    [%- CASE 'routing' -%]<span>Routing</span>
91
    [%- CASE 'routing' -%]<span>Routing</span>
92
    [%- CASE 'superserials' -%]<span>Manage subscriptions from any branch (only applies when IndependentBranches is used)</span>
92
    [%- CASE 'superserials' -%]<span>Manage subscriptions from any branch (only applies when IndependentBranches is used)</span>
93
    [%- CASE 'delete_reports' -%]<span>Delete SQL reports</span>
93
    [%- CASE 'create_reports' -%]<span>Create SQL reports</span>
94
    [%- CASE 'create_reports' -%]<span>Create SQL reports</span>
94
    [%- CASE 'execute_reports' -%]<span>Execute SQL reports</span>
95
    [%- CASE 'execute_reports' -%]<span>Execute SQL reports</span>
95
    [%- CASE 'add_reserves' -%]<span>Add course reserves</span>
96
    [%- CASE 'add_reserves' -%]<span>Add course reserves</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc (-1 / +1 lines)
Lines 25-31 Link Here
25
            </div>
25
            </div>
26
        [% END %]
26
        [% END %]
27
27
28
        [% IF ( CAN_user_reports_create_reports ) %]
28
        [% IF ( CAN_user_reports_delete_reports ) %]
29
            <div class="btn-group">
29
            <div class="btn-group">
30
                <a class="delete btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Delete%20Saved">
30
                <a class="delete btn btn-small" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% id %]&phase=Delete%20Saved">
31
                    <i class="fa fa-trash"></i> Delete
31
                    <i class="fa fa-trash"></i> Delete
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member-flags.tt (+6 lines)
Lines 499-504 Link Here
499
<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>
499
<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>
500
500
501
<ul>
501
<ul>
502
        <li>delete_reports
503
<ul>
504
        <li>Delete SQL Reports</li>
505
        <li>The ability to delete but not run SQL reports</li>
506
</ul>
507
</li>
502
	<li>create_reports
508
	<li>create_reports
503
<ul>
509
<ul>
504
	<li>Create SQL Reports</li>
510
	<li>Create SQL Reports</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-2 / +8 lines)
Lines 335-341 canned reports and writing custom SQL reports.</p> Link Here
335
            <tbody>
335
            <tbody>
336
                [% FOREACH savedreport IN savedreports %]
336
                [% FOREACH savedreport IN savedreports %]
337
                    [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
337
                    [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
338
                        <td><input type="checkbox" name="ids" value="[% savedreport.id %]" /></td>
338
                        <td>
339
                            [% IF ( CAN_user_reports_delete_reports ) %] <!-- not break CSS -->
340
                                <input type="checkbox" name="ids" value="[% savedreport.id %]" />
341
                            [% END %]
342
                        </td>
339
                        <td><label for="ids">[% savedreport.id %]</label></td>
343
                        <td><label for="ids">[% savedreport.id %]</label></td>
340
                        <td>
344
                        <td>
341
                            [% IF ( savedreport.report_name ) %]
345
                            [% IF ( savedreport.report_name ) %]
Lines 371-377 canned reports and writing custom SQL reports.</p> Link Here
371
                                    [% END %]
375
                                    [% END %]
372
                                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Run%20this%20report"><i class="fa fa-play"></i> Run</a></li>
376
                                    <li><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Run%20this%20report"><i class="fa fa-play"></i> Run</a></li>
373
                                    <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="fa fa-clock-o"></i> Schedule</a></li>
377
                                    <li><a href="/cgi-bin/koha/tools/scheduler.pl?id=[% savedreport.id %]"><i class="fa fa-clock-o"></i> Schedule</a></li>
374
                                    [% IF ( CAN_user_reports_create_reports ) %]
378
                                    [% IF ( CAN_user_reports_delete_reports ) %]
375
                                        <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a></li>
379
                                        <li><a class="confirmdelete" title="Delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=[% savedreport.id %]&amp;phase=Delete%20Saved"><i class="fa fa-trash"></i> Delete</a></li>
376
                                    [% END %]
380
                                    [% END %]
377
                                </ul>
381
                                </ul>
Lines 381-389 canned reports and writing custom SQL reports.</p> Link Here
381
                [% END %]
385
                [% END %]
382
            </tbody>
386
            </tbody>
383
        </table>
387
        </table>
388
        [% IF ( CAN_user_reports_delete_reports ) %]
384
        <fieldset class="action">
389
        <fieldset class="action">
385
            <input type="submit" value="Delete selected" />
390
            <input type="submit" value="Delete selected" />
386
        </fieldset>
391
        </fieldset>
392
        [% END %]
387
    </form>
393
    </form>
388
    </div>
394
    </div>
389
</div>
395
</div>
(-)a/reports/guided_reports.pl (-3 / +6 lines)
Lines 51-62 my $usecache = C4::Context->ismemcached; Link Here
51
51
52
my $phase = $input->param('phase') // '';
52
my $phase = $input->param('phase') // '';
53
my $flagsrequired;
53
my $flagsrequired;
54
if ( $phase eq 'Build new' or $phase eq 'Delete Saved' ) {
54
if ( $phase eq 'Build new' ) {
55
    $flagsrequired = 'create_reports';
55
    $flagsrequired = 'create_reports';
56
}
56
}
57
elsif ( $phase eq 'Use saved' ) {
57
elsif ( $phase eq 'Use saved' ) {
58
    $flagsrequired = 'execute_reports';
58
    $flagsrequired = 'execute_reports';
59
} else {
59
}
60
elsif ( $phase eq 'Delete Saved' ) {
61
    $flagsrequired = 'delete_reports';
62
}
63
else {
60
    $flagsrequired = '*';
64
    $flagsrequired = '*';
61
}
65
}
62
66
63
- 

Return to bug 16978