From 0893cc4cb6baacf171574969be80e9dfd6f72779 Mon Sep 17 00:00:00 2001 From: phasefx Date: Wed, 19 Jul 2006 17:53:00 +0000 Subject: [PATCH] handle boolean testing with a global function git-svn-id: svn://svn.open-ils.org/ILS/trunk@5086 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../staff_client/server/OpenILS/util_overlay.xul | 7 +++++++ Open-ILS/xul/staff_client/server/cat/bib_brief.xul | 4 ++-- Open-ILS/xul/staff_client/server/cat/copy_editor.js | 10 +++++----- .../xul/staff_client/server/cat/copy_summary.xul | 21 ++++----------------- .../xul/staff_client/server/circ/circ_brief.xul | 6 +++--- Open-ILS/xul/staff_client/server/circ/util.js | 10 +++++----- Open-ILS/xul/staff_client/server/patron/util.js | 10 +++++++--- 7 files changed, 33 insertions(+), 35 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul index 9b1785b491..9a47a17e1e 100644 --- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul +++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul @@ -33,6 +33,13 @@ } } + function get_bool(a) { + // Normal javascript interpretation except 'f' == false, per postgres + // So false includes 'f', '', 0, null, and undefined + if (a == 'f') return false; + if (a) return true; else return false; + } + ]]> diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief.xul b/Open-ILS/xul/staff_client/server/cat/bib_brief.xul index 831d16cdb9..58d7b0ae9e 100644 --- a/Open-ILS/xul/staff_client/server/cat/bib_brief.xul +++ b/Open-ILS/xul/staff_client/server/cat/bib_brief.xul @@ -105,8 +105,8 @@ ) ); var t = document.getElementById('caption').getAttribute('label'); - if (meta.deleted()) { t += ' (Deleted) '; } else { - if ( ! meta.active()) { t += ' (Inactive) '; } + if (get_bool( meta.deleted() )) { t += ' (Deleted) '; } else { + if ( ! get_bool( meta.active() ) ) { t += ' (Inactive) '; } } document.getElementById('caption').setAttribute('label',t); } catch(E) { diff --git a/Open-ILS/xul/staff_client/server/cat/copy_editor.js b/Open-ILS/xul/staff_client/server/cat/copy_editor.js index 36553c26f7..e4dd639743 100644 --- a/Open-ILS/xul/staff_client/server/cat/copy_editor.js +++ b/Open-ILS/xul/staff_client/server/cat/copy_editor.js @@ -502,14 +502,14 @@ g.panes_and_field_names = { [ "Circulate?", { - render: 'fm.circulate() == null ? "" : ( fm.circulate() == 1 ? "Yes" : "No" )', + render: 'fm.circulate() == null ? "" : ( get_bool( fm.circulate() ) ? "Yes" : "No" )', input: 'c = function(v){ g.apply("circulate",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ "Yes", "1" ], [ "No", "0" ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);', } ], [ "Holdable?", { - render: 'fm.holdable() == null ? "" : ( fm.holdable() == 1? "Yes" : "No" )', + render: 'fm.holdable() == null ? "" : ( get_bool( fm.holdable() ) ? "Yes" : "No" )', input: 'c = function(v){ g.apply("holdable",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ "Yes", "1" ], [ "No", "0" ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);', } ], @@ -565,7 +565,7 @@ g.panes_and_field_names = { [ "Deposit?", { - render: 'fm.deposit() == null ? "" : ( fm.deposit() == 1 ? "Yes" : "No" )', + render: 'fm.deposit() == null ? "" : ( get_bool( fm.deposit() ) ? "Yes" : "No" )', input: 'c = function(v){ g.apply("deposit",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ "Yes", "1" ], [ "No", "0" ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);', } ], @@ -587,14 +587,14 @@ g.panes_and_field_names = { [ "OPAC Visible?", { - render: 'fm.opac_visible() == null ? "" : ( fm.opac_visible() == 1 ? "Yes" : "No" )', + render: 'fm.opac_visible() == null ? "" : ( get_bool( fm.opac_visible() ) ? "Yes" : "No" )', input: 'c = function(v){ g.apply("opac_visible",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ "Yes", "1" ], [ "No", "0" ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);', } ], [ "Reference?", { - render: 'fm.ref() == null ? "" : ( fm.ref() == 1 ? "Yes" : "No" )', + render: 'fm.ref() == null ? "" : ( get_bool( fm.ref() ) ? "Yes" : "No" )', input: 'c = function(v){ g.apply("ref",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( [ [ "Yes", "1" ], [ "No", "0" ] ] ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);', } ], diff --git a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul index 4dd6b7c2bc..2af0a11b54 100644 --- a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul +++ b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul @@ -35,19 +35,6 @@ ' : ( typeof copy.age_protect() == 'object' ? copy.age_protect().name() : g.data.hash.crahp[ copy.age_protect() ].name() ) ); $w('location',copy.location().name()); $w('create_date',util.date.formatted_date(copy.create_date(),'%F')); diff --git a/Open-ILS/xul/staff_client/server/circ/circ_brief.xul b/Open-ILS/xul/staff_client/server/circ/circ_brief.xul index 0c3892a27b..0e1627613c 100644 --- a/Open-ILS/xul/staff_client/server/circ/circ_brief.xul +++ b/Open-ILS/xul/staff_client/server/circ/circ_brief.xul @@ -66,9 +66,9 @@ $('id').value = r_circ.id() ? r_circ.id() : ''; $('stop_fines').value = r_circ.stop_fines() ? r_circ.stop_fines() : ''; var r = ''; - if (r_circ.desk_renewal() == 't' || r_circ.desk_renewal() == '1') r += 'DESK '; - if (r_circ.opac_renewal() == 't' || r_circ.opac_renewal() == '1') r += 'OPAC '; - if (r_circ.phone_renewal() == 't' || r_circ.phone_renewal() == '1') r += 'PHONE '; + if (get_bool( r_circ.desk_renewal() ) ) r += 'DESK '; + if (get_bool(r_circ.opac_renewal() ) ) r += 'OPAC '; + if (get_bool(r_circ.phone_renewal() ) ) r += 'PHONE '; $('renewal').value = r || 'No'; } catch(E) { g.error.standard_unexpected_error_alert('Failure rendering circ.',E); diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js index 10894e7aeb..c877a34d67 100644 --- a/Open-ILS/xul/staff_client/server/circ/util.js +++ b/Open-ILS/xul/staff_client/server/circ/util.js @@ -368,23 +368,23 @@ circ.util.columns = function(modify,params) { }, { 'id' : 'circulate', 'label' : 'Circulate?', 'flex' : 1, - 'primary' : false, 'hidden' : true, 'render' : 'my.acp.circulate() == 1 ? "Yes" : "No"', 'persist' : 'hidden width', + 'primary' : false, 'hidden' : true, 'render' : 'get_bool( my.acp.circulate() ) ? "Yes" : "No"', 'persist' : 'hidden width', }, { 'id' : 'holdable', 'label' : 'Holdable?', 'flex' : 1, - 'primary' : false, 'hidden' : true, 'render' : 'my.acp.holdable() == 1 ? "Yes" : "No"', 'persist' : 'hidden width', + 'primary' : false, 'hidden' : true, 'render' : 'get_bool( my.acp.holdable() ) ? "Yes" : "No"', 'persist' : 'hidden width', }, { 'id' : 'opac_visible', 'label' : 'OPAC Visible?', 'flex' : 1, - 'primary' : false, 'hidden' : true, 'render' : 'my.acp.opac_visible() == 1 ? "Yes" : "No"', 'persist' : 'hidden width', + 'primary' : false, 'hidden' : true, 'render' : 'get_bool( my.acp.opac_visible() ) ? "Yes" : "No"', 'persist' : 'hidden width', }, { 'persist' : 'hidden width', 'id' : 'ref', 'label' : 'Reference?', 'flex' : 1, - 'primary' : false, 'hidden' : true, 'render' : 'my.acp.ref() == 1 ? "Yes" : "No"' + 'primary' : false, 'hidden' : true, 'render' : 'get_bool( my.acp.ref() ) ? "Yes" : "No"' }, { 'persist' : 'hidden width', 'id' : 'deposit', 'label' : 'Deposit?', 'flex' : 1, - 'primary' : false, 'hidden' : true, 'render' : 'my.acp.deposit() == 1 ? "Yes" : "No"' + 'primary' : false, 'hidden' : true, 'render' : 'get_bool( my.acp.deposit() ) ? "Yes" : "No"' }, { 'persist' : 'hidden width', 'id' : 'deposit_amount', 'label' : getString('staff.acp_label_deposit_amount'), 'flex' : 1, diff --git a/Open-ILS/xul/staff_client/server/patron/util.js b/Open-ILS/xul/staff_client/server/patron/util.js index bf94dcc8f2..fcf704477e 100644 --- a/Open-ILS/xul/staff_client/server/patron/util.js +++ b/Open-ILS/xul/staff_client/server/patron/util.js @@ -108,7 +108,7 @@ patron.util.mb_columns = function(modify,params) { }, { 'persist' : 'hidden width', 'id' : 'voided', 'label' : 'Voided', 'flex' : 1, - 'primary' : false, 'hidden' : false, 'render' : 'my.mb.voided() == "t" ? "Yes" : "No"' + 'primary' : false, 'hidden' : false, 'render' : 'get_bool( my.mb.voided() ) ? "Yes" : "No"' }, { 'persist' : 'hidden width', 'id' : 'voider', 'label' : 'Voider', 'flex' : 1, @@ -235,11 +235,11 @@ patron.util.columns = function(modify,params) { }, { 'persist' : 'hidden width', 'id' : 'active', 'label' : getString('staff.au_label_active'), 'flex' : 1, - 'primary' : false, 'hidden' : true, 'render' : 'my.au.active() ? "Yes" : "No"' + 'primary' : false, 'hidden' : true, 'render' : 'get_bool( my.au.active() ) ? "Yes" : "No"' }, { 'persist' : 'hidden width', 'id' : 'barred', 'label' : 'Barred', 'flex' : 1, - 'primary' : false, 'hidden' : true, 'render' : 'my.au.barred() ? "Yes" : "No"' + 'primary' : false, 'hidden' : true, 'render' : 'get_bool( my.au.barred() ) ? "Yes" : "No"' }, { 'persist' : 'hidden width', 'id' : 'id', 'label' : getString('staff.au_label_id'), 'flex' : 1, @@ -329,6 +329,10 @@ patron.util.columns = function(modify,params) { 'persist' : 'hidden width', 'id' : 'net_access_level', 'label' : 'Net Access', 'flex' : 1, 'primary' : false, 'hidden' : true, 'render' : 'my.au.net_access_level()' }, + { + 'persist' : 'hidden width', 'id' : 'master_account', 'label' : 'Group Lead', 'flex' : 1, + 'primary' : false, 'hidden' : true, 'render' : 'get_bool( my.au.master_account() ) ? "Yes" : "No"' + }, ]; for (var i = 0; i < c.length; i++) { if (modify[ c[i].id ]) { -- 2.11.0