[Koha-patches] [PATCH] Fixes Bug 2969: Report Name should be mandatory for saved reports

[amit gupta]

>From 4404a9069067f2c937d6dbb78a4b2b3ee3479751 Mon Sep 17 00:00:00 2001
From: Amit Gupta <amit.gu...@osslabs.biz>
Date: Wed, 14 Jul 2010 12:13:49 +0530
Subject: [PATCH] Fixes Bug 2969: Report Name should be mandatory for saved
reports

---
 installer/data/mysql/kohastructure.sql             |    2 +-
 .../en/modules/reports/guided_reports_start.tmpl   |   26
++++++++++++++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql
b/installer/data/mysql/kohastructure.sql
index e42cecd..6d712df 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -1589,7 +1589,7 @@ CREATE TABLE saved_sql (
   `last_modified` datetime default NULL,
   `savedsql` text,
   `last_run` datetime default NULL,
-   `report_name` varchar(255) default NULL,
+   `report_name` varchar(255) NOT NULL default '',
   `type` varchar(255) default NULL,
   `notes` text,
   PRIMARY KEY  (`id`),
diff --git
a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
index 7a24859..aa8ce67 100644
---
a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
+++
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
@@ -406,6 +406,17 @@ NAME="name" -->"><!-- TMPL_VAR
NAME="name"--></label></td><td>
 <!-- /TMPL_IF -->

 <!-- TMPL_IF NAME="save" -->
+<script type="text/javascript">
+//<![CDATA[
+function check(f) {
+if (f.reportname.value == "") {
+    alert(_("You must specify a Report name."));
+    return false;
+}
+    f.submit();
+}
+//]]>
+</script>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
 <input type="hidden" name="sql" value="<!-- TMPL_VAR NAME="sql"
ESCAPE="html" -->" />
 <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" />
@@ -416,7 +427,7 @@ NAME="name" -->"><!-- TMPL_VAR
NAME="name"--></label></td><td>
    <li><label for="notes">Notes:</label> <textarea name="notes"
id="notes"></textarea></li>
 </ol></fieldset>
 <fieldset class="action"><input type="hidden" name="phase" value="Save
Report" />
-<input type="submit" name="submit" value="Save Report" /></fieldset>
+<input type="button" value="Save" onclick="check(this.form);"/></fieldset>
 </form>
 <!-- /TMPL_IF -->

@@ -531,6 +542,17 @@ Sub report:<select name="subreport">
 <!-- /TMPL_IF -->

 <!-- TMPL_IF NAME="editsql" -->
+<script type="text/javascript">
+//<![CDATA[
+function check(f) {
+if (f.reportname.value == "") {
+    alert(_("You must specify a Report name."));
+    return false;
+}
+    f.submit();
+}
+//]]>
+</script>
 <form action="/cgi-bin/koha/reports/guided_reports.pl" method="post">
 <input type="hidden" name="phase" value="Update SQL" />
 <input type="hidden" name="id" value="<!-- TMPL_VAR NAME="id" -->"/>
@@ -544,7 +566,7 @@ Sub report:<select name="subreport">
 </fieldset>

 <fieldset class="action">
-<input type="submit" name="submit" value="Update SQL" /></fieldset>
+<input type="button" value="Update SQL" onclick="check(this.form);"
/></fieldset>
 </form>


--
1.5.4.5

_______________________________________________
Koha-patches mailing list
Koha-patches@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches