From 0d9a92a4254c3a7a4f4908db95eac8c7634992af Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 29 Oct 2014 13:34:03 -0400 Subject: [PATCH] [PASSED QA] Bug 13161 - Report name should be mandatory when editing saved reports When Bug 2969 made report name required for SQL reports, it did so only for new reports. This patch makes the same requirement true when editing existing reports. Other changes: - Removed unused "type" setting from edit screen (already removed from creation form). - Added form field size attribute to report name field to match creation form. - Moved SQL textarea into its own fieldset and marked it as required, matching the report creation form. To test, apply the patch and edit an existing saved SQL report. You should be prevented from saving your report with either the report name or SQL field blank. Test with JavaScript enable and disabled. Confirm that after entering valid data your report runs correctly. Compare the new SQL report form with the update SQL report form. They should be structured the same. Signed-off-by: Nick Clemens Signed-off-by: Katrin Fischer Passes tests and QA script. Works as described. --- .../en/modules/reports/guided_reports_start.tt | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) 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 7508730..6b630a4 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 @@ -856,8 +856,8 @@ $(document).ready(function() { Create report from SQL
  1. - [% IF ( reportname ) %] - [% ELSE %][% END %] Required + [% IF ( reportname ) %] + [% ELSE %][% END %] Required
  2. [% PROCESS group_and_subgroup_selection %] @@ -876,13 +876,6 @@ $(document).ready(function() { [% END %]
  3. -
  4. - -
@@ -945,13 +938,13 @@ Sub report:
Edit SQL report
    -
  1. +
  2. Required
  3. [% PROCESS group_and_subgroup_selection %] [% IF (public) %]
  4. @@ -968,10 +961,16 @@ Sub report: [% END %]
  5. -
+
+ SQL: +
+ Required +
+
+
Cancel
-- 1.9.1