From 0f70ac18bdec47eaa7d697e8e7f9aff185e31494 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 21 Sep 2011 16:46:03 -0400 Subject: [PATCH] Fiscal calendar selection in Org Unit Config UI Signed-off-by: Bill Erickson --- Open-ILS/web/conify/global/actor/org_unit.html | 30 ++++++++++++++++++++++++-- Open-ILS/web/opac/locale/en-US/conify.dtd | 1 + 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/Open-ILS/web/conify/global/actor/org_unit.html b/Open-ILS/web/conify/global/actor/org_unit.html index 1c71ea4bf9..aa2f838aaf 100644 --- a/Open-ILS/web/conify/global/actor/org_unit.html +++ b/Open-ILS/web/conify/global/actor/org_unit.html @@ -122,6 +122,15 @@ } }); + pcrud.retrieveAll( 'acqfc', { + timeout : 10, order_by : { acqfc : 'name' }, + oncomplete : function (r) { + window._fiscal_cal_list = r.recv().content(); + window._fiscal_cal_data = aout.toStoreData( window._fiscal_cal_list ); + window.fiscal_cal_store = new dojo.data.ItemFileReadStore({ data : window._fiscal_cal_data }); + } + }); + highlighter.ou_tree = {}; highlighter.editor_pane = {}; highlighter.hoo_pane = {}; @@ -166,7 +175,7 @@ dojo.byId('current_ou_name').innerHTML = this.store.getValue( current_ou, 'name' ); - var main_settings_fields = [ 'name', 'shortname', 'email', 'phone', 'ou_type' ]; + var main_settings_fields = [ 'name', 'shortname', 'email', 'phone', 'ou_type', 'fiscal_calendar' ]; for ( var i in main_settings_fields ) { var field = main_settings_fields[i]; var value = this.store.getValue( current_ou, field ); @@ -296,6 +305,23 @@ + + &conify.org_unit.editor_pane.fiscal_calendar; + +
+ +
+ + &conify.org_unit.editor_pane.opac_visible; @@ -386,7 +412,7 @@ save_ou_button.disabled = true; delete_ou_button.disabled = true; - var main_settings_fields = [ 'name', 'shortname', 'email', 'phone', 'ou_type', 'parent_ou' ]; + var main_settings_fields = [ 'name', 'shortname', 'email', 'phone', 'ou_type', 'parent_ou', 'fiscal_calendar' ]; for ( var i in main_settings_fields ) { var field = main_settings_fields[i]; window["editor_pane_" + field].setValue( '' ); // unset the value diff --git a/Open-ILS/web/opac/locale/en-US/conify.dtd b/Open-ILS/web/opac/locale/en-US/conify.dtd index c0cf5a7992..54674bff96 100644 --- a/Open-ILS/web/opac/locale/en-US/conify.dtd +++ b/Open-ILS/web/opac/locale/en-US/conify.dtd @@ -33,6 +33,7 @@ + -- 2.11.0