From 93b989e397451fc9a0e96a3a57b479d44d476c4f Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 16 May 2007 18:00:41 +0000
Subject: [PATCH] added check for duplicate report-name-per-folder on report
 creation

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_0@7320 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/reports/oils_rpt_editor.xhtml     |  4 +++
 Open-ILS/web/reports/oils_rpt_report_editor.js | 43 ++++++++++++++++----------
 Open-ILS/web/reports/oils_rpt_vars.js          |  2 ++
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/Open-ILS/web/reports/oils_rpt_editor.xhtml b/Open-ILS/web/reports/oils_rpt_editor.xhtml
index 71fba14c06..7d06d777ed 100644
--- a/Open-ILS/web/reports/oils_rpt_editor.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_editor.xhtml
@@ -215,4 +215,8 @@
 		Please fill in all fields.
 	</span>
 
+    <span id='oils_rpt_report_exists' class='hide_me'>
+        There is already a report in this folder with the given name.
+    </span>
+
 </div>
diff --git a/Open-ILS/web/reports/oils_rpt_report_editor.js b/Open-ILS/web/reports/oils_rpt_report_editor.js
index 98d484cf19..778078a9d0 100644
--- a/Open-ILS/web/reports/oils_rpt_report_editor.js
+++ b/Open-ILS/web/reports/oils_rpt_report_editor.js
@@ -150,22 +150,33 @@ oilsRptReportEditor.prototype.save = function() {
 	//return;
 
 	var obj = this;
-	var req = new Request(OILS_RPT_CREATE_REPORT, SESSION, report, schedule );
-	req.callback(
-		function(r) {
-			var res = r.getResultObject();
-			if(checkILSEvent(res)) {
-				alertILSEvent(res);
-			} else {
-				if( res && res != '0' ) {
-					oilsRptAlertSuccess();
-					oilsRptCurrentFolderManager.draw();
-					obj.folderWindow.draw();
-				}
-			}
-		}
-	);
-	req.send();
+    var folderReq = new Request(OILS_RPT_REPORT_EXISTS, SESSION, report);
+    folderReq.callback(
+        function(r1) {
+            if(r1.getResultObject() == 1) {
+                alertId('oils_rpt_report_exists');
+                return;
+            } else {
+                var req = new Request(OILS_RPT_CREATE_REPORT, SESSION, report, schedule );
+                req.callback(
+                    function(r) {
+                        var res = r.getResultObject();
+                        if(checkILSEvent(res)) {
+                            alertILSEvent(res);
+                        } else {
+                            if( res && res != '0' ) {
+                                oilsRptAlertSuccess();
+                                oilsRptCurrentFolderManager.draw();
+                                obj.folderWindow.draw();
+                            }
+                        }
+                    }
+                );
+                req.send();
+            }
+        }
+    );
+    folderReq.send();
 }
 
 
diff --git a/Open-ILS/web/reports/oils_rpt_vars.js b/Open-ILS/web/reports/oils_rpt_vars.js
index 807361dcca..ef365d3a59 100644
--- a/Open-ILS/web/reports/oils_rpt_vars.js
+++ b/Open-ILS/web/reports/oils_rpt_vars.js
@@ -91,6 +91,8 @@ var OILS_RPT_FETCH_OUTPUT			= 'open-ils.reporter:open-ils.reporter.schedule.retr
 var OILS_RPT_FETCH_REPORT			= 'open-ils.reporter:open-ils.reporter.report.retrieve';
 var OILS_RPT_FETCH_TEMPLATE		= 'open-ils.reporter:open-ils.reporter.template.retrieve';
 var OILS_RPT_MAGIC_FETCH			= 'open-ils.reporter:open-ils.reporter.magic_fetch';
+var OILS_RPT_REPORT_EXISTS      = 'open-ils.reporter:open-ils.reporter.report.exists';
+var OILS_RPT_TEMPLATE_EXISTS      = 'open-ils.reporter:open-ils.reporter.template.exists';
 
 var oilsRptCurrentFolderManager;
 
-- 
2.11.0