From 0467a19341454692b9f30a36637a194873de1c62 Mon Sep 17 00:00:00 2001 From: miker Date: Tue, 29 May 2007 14:11:00 +0000 Subject: [PATCH] adding new transform types; making left-joins safer git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_0@7384 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/reports/xul/template-config.js | 4 ++-- Open-ILS/web/reports/xul/transforms.js | 24 ++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Open-ILS/web/reports/xul/template-config.js b/Open-ILS/web/reports/xul/template-config.js index ab4270ca8f..5b18a3b2df 100644 --- a/Open-ILS/web/reports/xul/template-config.js +++ b/Open-ILS/web/reports/xul/template-config.js @@ -845,8 +845,8 @@ function fleshFromPath ( template, rel ) { prev_type == 'left' || rel.reltype != 'has_a' ) && ( - !rel.fields.filter_tab && - !rel.fields.aggfitler_tab + getKeys(rel.fields.filter_tab).length == 0 && + getKeys(rel.fields.aggfitler_tab).length == 0 ) ) current_obj.type = 'left'; diff --git a/Open-ILS/web/reports/xul/transforms.js b/Open-ILS/web/reports/xul/transforms.js index 11037893d7..c901f346ec 100644 --- a/Open-ILS/web/reports/xul/transforms.js +++ b/Open-ILS/web/reports/xul/transforms.js @@ -3,10 +3,30 @@ var OILS_RPT_DTYPE_MONEY = 'money'; var OILS_RPT_DTYPE_BOOL = 'bool'; var OILS_RPT_DTYPE_INT = 'int'; var OILS_RPT_DTYPE_ID = 'id'; +var OILS_RPT_DTYPE_OU = 'org_unit'; var OILS_RPT_DTYPE_FLOAT = 'float'; var OILS_RPT_DTYPE_TIMESTAMP = 'timestamp'; - -var OILS_RPT_DTYPE_ALL = [OILS_RPT_DTYPE_STRING,OILS_RPT_DTYPE_MONEY,OILS_RPT_DTYPE_INT,OILS_RPT_DTYPE_ID,OILS_RPT_DTYPE_FLOAT,OILS_RPT_DTYPE_TIMESTAMP,OILS_RPT_DTYPE_BOOL]; +var OILS_RPT_DTYPE_INTERVAL = 'interval'; +var OILS_RPT_DTYPE_LINK = 'link'; +var OILS_RPT_DTYPE_NONE = ''; +var OILS_RPT_DTYPE_NULL = null; +var OILS_RPT_DTYPE_UNDEF; + +var OILS_RPT_DTYPE_ALL = [ + OILS_RPT_DTYPE_STRING, + OILS_RPT_DTYPE_MONEY, + OILS_RPT_DTYPE_INT, + OILS_RPT_DTYPE_ID, + OILS_RPT_DTYPE_FLOAT, + OILS_RPT_DTYPE_TIMESTAMP, + OILS_RPT_DTYPE_BOOL, + OILS_RPT_DTYPE_OU, + OILS_RPT_DTYPE_NONE, + OILS_RPT_DTYPE_NULL, + OILS_RPT_DTYPE_UNDEF, + OILS_RPT_DTYPE_INTERVAL, + OILS_RPT_DTYPE_LINK +]; var OILS_RPT_DTYPE_NOT_ID = [OILS_RPT_DTYPE_STRING,OILS_RPT_DTYPE_MONEY,OILS_RPT_DTYPE_INT,OILS_RPT_DTYPE_FLOAT,OILS_RPT_DTYPE_TIMESTAMP]; var OILS_RPT_DTYPE_NOT_BOOL = [OILS_RPT_DTYPE_STRING,OILS_RPT_DTYPE_MONEY,OILS_RPT_DTYPE_INT,OILS_RPT_DTYPE_FLOAT,OILS_RPT_DTYPE_TIMESTAMP,OILS_RPT_DTYPE_ID]; -- 2.11.0