From 04b0677824ef64c617a52735e752743bfc90f986 Mon Sep 17 00:00:00 2001 From: erickson Date: Thu, 26 Apr 2007 16:16:35 +0000 Subject: [PATCH] added more descriptive wording to the template/report delete git-svn-id: svn://svn.open-ils.org/ILS/trunk@7176 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../web/reports/oils_rpt_folder_window.js | 6 ++++-- .../web/reports/oils_rpt_folder_window.xhtml | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.js b/Open-ILS/web/reports/oils_rpt_folder_window.js index 73e8f726e1..d017f9ad49 100644 --- a/Open-ILS/web/reports/oils_rpt_folder_window.js +++ b/Open-ILS/web/reports/oils_rpt_folder_window.js @@ -221,6 +221,7 @@ oilsRptFolderWindow.prototype.doFolderAction = function() { var obj = this; switch(action) { + case 'create_report' : hideMe(DOM.oils_rpt_folder_table_right_td); unHideMe(DOM.oils_rpt_folder_table_alt_td); @@ -228,12 +229,12 @@ oilsRptFolderWindow.prototype.doFolderAction = function() { new oilsRptReportEditor(new oilsReport(objs[0]), this); break; case 'delete_report' : - if(!confirmId('oils_rpt_folder_contents_confirm_delete')) return; + if(!confirmId('oils_rpt_verify_report_delete')) return; this.deleteReports(objs, 0, successCallback); break; case 'delete_template' : - if(!confirmId('oils_rpt_folder_contents_confirm_delete')) return; + if(!confirmId('oils_rpt_verify_template_delete')) return; this.deleteTemplates(objs, 0, successCallback); break; @@ -418,6 +419,7 @@ oilsRptFolderWindow.prototype.deleteTemplates = function(list, idx, callback, er } else { + // var req0 = new Request( OILS_RPT_TEMPLATE_HAS_RPTS, SESSION, tmpl.id() ); // req0.callback( // function(r0) { diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml index e04ce8c481..5aab176303 100644 --- a/Open-ILS/web/reports/oils_rpt_folder_window.xhtml +++ b/Open-ILS/web/reports/oils_rpt_folder_window.xhtml @@ -122,6 +122,26 @@ You may not move another user's items + + This will also delete all of your attached reports and outputs for + this template. + + If other users have reports or outputs attached to this template, + those will be left untouched and the template will not be deleted. + + Do you wish continue? + + + + This will also delete all of your attached outputs for + this report. + + If other users have outputs attached to this report, + those will be left untouched and the report will not be deleted. + + Do you wish continue? + + -- 2.43.2