From 673dc5861b2cb894aa13b19db2260897ce92f6c6 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 6 Oct 2006 02:12:36 +0000
Subject: [PATCH] fixed an output delete bug, added a brief column display in
 the report editor

git-svn-id: svn://svn.open-ils.org/ILS/trunk@6400 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/web/reports/oils_rpt_editor.xhtml     | 4 ++++
 Open-ILS/web/reports/oils_rpt_folder_window.js | 2 +-
 Open-ILS/web/reports/oils_rpt_report_editor.js | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/web/reports/oils_rpt_editor.xhtml b/Open-ILS/web/reports/oils_rpt_editor.xhtml
index 15db6ca6e1..a460e1e6b8 100644
--- a/Open-ILS/web/reports/oils_rpt_editor.xhtml
+++ b/Open-ILS/web/reports/oils_rpt_editor.xhtml
@@ -22,6 +22,10 @@
 				<td>Report Description:</td>
 				<td><textarea cols='45' rows='2' id='oils_rpt_report_editor_desc'/></td>
 			</tr>
+			<tr>
+				<td>Report Columns:</td>
+				<td><b id='oils_rpt_report_editor_cols'/></td>
+			</tr>
 			<tr><td colspan='2'><hr/></td></tr>
 			<tr>
 				<th>Choose a folder to store this report definition: </th>
diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.js b/Open-ILS/web/reports/oils_rpt_folder_window.js
index 6d107cbe74..fad99fb9f3 100644
--- a/Open-ILS/web/reports/oils_rpt_folder_window.js
+++ b/Open-ILS/web/reports/oils_rpt_folder_window.js
@@ -229,7 +229,7 @@ oilsRptFolderWindow.prototype.deleteOutputs = function(list, idx, callback, erri
 	if( idx >= list.length ) return callback(errid);
 	var output = list[idx];
 
-	if( list.runner().id()  != USER.id() ) {
+	if( output.runner().id()  != USER.id() ) {
 		this.deleteOutputs(list, ++idx, 
 			callback, 'oils_rpt_folder_contents_no_delete');
 
diff --git a/Open-ILS/web/reports/oils_rpt_report_editor.js b/Open-ILS/web/reports/oils_rpt_report_editor.js
index e5653e722d..9e231fe1ac 100644
--- a/Open-ILS/web/reports/oils_rpt_report_editor.js
+++ b/Open-ILS/web/reports/oils_rpt_report_editor.js
@@ -13,10 +13,18 @@ function oilsRptReportEditor(rptObject, folderWindow) {
 	appendClear(DOM.oils_rpt_report_editor_template_creator, tmpl.owner().usrname());
 	appendClear(DOM.oils_rpt_report_editor_template_description, tmpl.description());
 
+	appendClear(DOM.oils_rpt_report_editor_cols,' | ');
+	iterate(rptObject.def.select, 
+		function(i) {
+			DOM.oils_rpt_report_editor_cols.appendChild(text(i.alias +' | '));
+		}
+	);
+
 	if( rpt ) {
 		DOM.oils_rpt_report_editor_name.value = rpt.name();
 		DOM.oils_rpt_report_editor_description.value = rpt.description();
 	}
+
 	this.paramEditor = new oilsRptParamEditor(
 		rptObject, DOM.oils_rpt_param_editor_tbody);
 	this.paramEditor.draw();
-- 
2.11.0