@@ -, +, @@ button menu. My original idea was to have it be a split button, but the logic for handling various permissions made the template logic too convoluted. (https://getbootstrap.com/docs/3.3/javascript/#buttons-single-toggle). This type of button is specifically designed for this kind of interface element. - Logged in as a user with Create and Delete report permissions: - View an SQL report. In the toolbar you should see an "Edit" button menu with three options: Edit, Duplicate, and Delete. Check that all work correctly, including a deletion JavaScript confirmation dialog. - Logged in as a user with Create but not Delete report permissions, you should see an "Edit" button menu with two choices: Edit and Duplicate. - Logged in as a user with Delete but not Create report permission (??) you should see only a standalone delete button. - Logged in as a user with Execute report permission, run an SQL report. Test the "Show SQL code" button. The text should change to "Hide SQL code" and the button should be styled to look like its "pressed" state. --- .../prog/en/includes/reports-toolbar.inc | 59 ++++++++++++------- .../modules/reports/guided_reports_start.tt | 13 ++-- 2 files changed, 48 insertions(+), 24 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -14,29 +14,49 @@ [% END %] [% IF ( showsql || execute || editsql || save_successful ) %] - [% IF ( CAN_user_reports_create_reports ) %] - [% UNLESS ( editsql ) # Do not show edit button on edit page %] -
- - Edit - -
- [% END %] -
- - Duplicate - -
- [% END %] - - [% IF ( CAN_user_reports_delete_reports ) %] + [% IF ( CAN_user_reports_delete_reports && !CAN_user_reports_create_reports ) %]
Delete
+ [% ELSE %] + [% IF ( CAN_user_reports_create_reports || CAN_user_reports_delete_reports ) %] +
+ + +
+ [% END %] [% END %] + [% END %] + [% IF ( showsql || execute || editsql || save_successful ) %] [% UNLESS ( errors ) # Unless there are errors saving a report %]
@@ -103,10 +123,9 @@
- Show SQL code -
-
- +
[% IF allresults.size %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -5,6 +5,7 @@ [% USE Koha %] [% USE TablesSettings %] [% USE JSON.Escape %] +[% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [%- BLOCK area_name -%] @@ -1977,10 +1978,14 @@ }); [% END %] - $(".toggle_sql").click(function(){ - $("#sql_output").toggle(); - $("#toggle_sql_hid").toggle(); - $("#toggle_sql_vis").toggle(); + $("#toggle_sql").click(function(){ + var sql_output = $("#sql_output"); + sql_output.toggle(); + if( sql_output.is(":visible") ){ + $(this).button('complete'); + } else { + $(this).button('reset'); + } if( !showsql ){ showsql = CodeMirror.fromTextArea(sql, { lineNumbers: false, --