From 61bc42045a9d531ff08450f226c6c96907f4660e Mon Sep 17 00:00:00 2001 From: erickson Date: Mon, 2 Oct 2006 04:43:38 +0000 Subject: [PATCH] more output support, more report editor options, etc. git-svn-id: svn://svn.open-ils.org/ILS/trunk@6330 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/reports/oils_rpt.js | 15 ++- Open-ILS/web/reports/oils_rpt.xhtml | 6 +- Open-ILS/web/reports/oils_rpt_builder.js | 2 +- .../web/reports/oils_rpt_folder_window.js | 93 ++++++++++++++----- .../web/reports/oils_rpt_folder_window.xhtml | 18 +++- .../web/reports/oils_rpt_report_editor.js | 12 +++ Open-ILS/web/reports/oils_rpt_utils.js | 48 +++++++++- Open-ILS/web/reports/oils_rpt_vars.js | 4 + 8 files changed, 165 insertions(+), 33 deletions(-) diff --git a/Open-ILS/web/reports/oils_rpt.js b/Open-ILS/web/reports/oils_rpt.js index 74a559a7ee..84c3a58dee 100644 --- a/Open-ILS/web/reports/oils_rpt.js +++ b/Open-ILS/web/reports/oils_rpt.js @@ -5,15 +5,21 @@ function oilsInitReports() { document.captureEvents(Event.MOUSEMOVE); document.onmousemove = setMousePos; - //DEBUG = 1; - var cgi = new CGI(); fetchUser(cgi.param('ses')); DOM.oils_rpt_user.appendChild(text(USER.usrname())); - oilsRptDebugEnabled = cgi.param('dbg'); - if(oilsRptDebugEnabled) DEBUG = 1; + fetchHighestPermOrgs(SESSION, USER.id(), ['RUN_REPORTS']); + if( PERMS['RUN_REPORTS'] == -1 ) { + unHideMe(DOM.oils_rpt_permission_denied); + hideMe(DOM.oils_rpt_tree_loading); + return false; + } + + oilsRptCookie = new HTTP.Cookies(); oilsRptCurrentOrg = USER.ws_ou(); + cookieManager.write(COOKIE_SES, SESSION, -1, '/'); + cookieManager.write('ws_ou', USER.ws_ou(), -1, '/'); oilsRptFetchOrgTree( function() { @@ -25,6 +31,7 @@ function oilsInitReports() { ) } ); + return true; } function oilsRtpInitFolders() { diff --git a/Open-ILS/web/reports/oils_rpt.xhtml b/Open-ILS/web/reports/oils_rpt.xhtml index 146338390c..ecfb417439 100644 --- a/Open-ILS/web/reports/oils_rpt.xhtml +++ b/Open-ILS/web/reports/oils_rpt.xhtml @@ -13,11 +13,15 @@ - +

You are logged in as

+ You do not have sufficient permissions to run reports +