[open-ils-commits] r19734 - in trunk/Open-ILS: web/js/dojo/openils/widget web/opac/locale/en-US web/templates/default/conify/global/config xul/staff_client/chrome/content/main (erickson)
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Mar 14 12:34:28 EDT 2011
Author: erickson
Date: 2011-03-14 12:34:25 -0400 (Mon, 14 Mar 2011)
New Revision: 19734
Modified:
trunk/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/web/templates/default/conify/global/config/record_attr_definition.tt2
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
Log:
More menu work for record attr/coded map config UIs
menu entry for config.coded_value_maps,
updated menu label and page title for config.record_attr_definition page;
in some cases (that probabl need investigating), widget.validate function is not defined. in those cases, don't attempt to call the function
Modified: trunk/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js 2011-03-14 04:47:12 UTC (rev 19733)
+++ trunk/Open-ILS/web/js/dojo/openils/widget/AutoFieldWidget.js 2011-03-14 16:34:25 UTC (rev 19734)
@@ -583,7 +583,8 @@
// invalid data. This change tells dojo to pretend this focusing has
// already happened so we can style required widgets during page render.
this.widget._hasBeenBlurred = true;
- this.widget.validate();
+ if(this.widget.validate)
+ this.widget.validate();
}
},
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2011-03-14 04:47:12 UTC (rev 19733)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2011-03-14 16:34:25 UTC (rev 19734)
@@ -706,7 +706,8 @@
<!ENTITY staff.main.menu.admin.server_admin.conify.grp_tree.label "Permission Groups">
<!ENTITY staff.main.menu.admin.server_admin.conify.perm_list.label "Permissions">
<!ENTITY staff.main.menu.admin.server_admin.conify.copy_status.label "Copy Statuses">
-<!ENTITY staff.main.menu.admin.server_admin.conify.marc_code_maps.label "Coded Value Maps">
+<!ENTITY staff.main.menu.admin.server_admin.conify.marc_record_attrs.label "MARC Record Attributes">
+<!ENTITY staff.main.menu.admin.server_admin.conify.coded_value_maps.label "MARC Coded Value Maps">
<!ENTITY staff.main.menu.admin.server_admin.conify.billing_type.label "Billing Types">
<!ENTITY staff.main.menu.admin.server_admin.conify.z3950_source.label "Z39.50 Servers">
<!ENTITY staff.main.menu.admin.server_admin.conify.circulation_modifier.label "Circulation Modifiers">
Modified: trunk/Open-ILS/web/templates/default/conify/global/config/record_attr_definition.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/conify/global/config/record_attr_definition.tt2 2011-03-14 04:47:12 UTC (rev 19733)
+++ trunk/Open-ILS/web/templates/default/conify/global/config/record_attr_definition.tt2 2011-03-14 16:34:25 UTC (rev 19734)
@@ -1,4 +1,5 @@
[% WRAPPER default/base.tt2 %]
+[% ctx.page_title = 'MARC Record Attribute Definitions' %]
<h1>Record Attribute Definitions</h1> <br/>
<div dojoType="dijit.layout.ContentPane" layoutAlign="client" class='oils-header-panel'>
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2011-03-14 04:47:12 UTC (rev 19733)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2011-03-14 16:34:25 UTC (rev 19734)
@@ -732,6 +732,10 @@
['oncommand'],
function() { open_eg_web_page('conify/global/config/record_attr_definition'); }
],
+ 'cmd_server_admin_coded_value_map' : [
+ ['oncommand'],
+ function() { open_eg_web_page('conify/global/config/coded_value_map'); }
+ ],
'cmd_server_admin_billing_type' : [
['oncommand'],
function() { open_eg_web_page('conify/global/config/billing_type'); }
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2011-03-14 04:47:12 UTC (rev 19733)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul 2011-03-14 16:34:25 UTC (rev 19734)
@@ -139,6 +139,7 @@
<command id="cmd_server_admin_perm_list"/>
<command id="cmd_server_admin_copy_status"/>
<command id="cmd_server_admin_marc_code"/>
+ <command id="cmd_server_admin_coded_value_map"/>
<command id="cmd_server_admin_billing_type"/>
<command id="cmd_server_admin_acq_invoice_item_type"/>
<command id="cmd_server_admin_acq_invoice_payment_method"/>
@@ -391,7 +392,8 @@
<menuitem label="&staff.main.menu.admin.server_admin.conify.grp_tree.label;" command="cmd_server_admin_grp_tree"/>
<menuitem label="&staff.main.menu.admin.server_admin.conify.perm_list.label;" command="cmd_server_admin_perm_list"/>
<menuitem label="&staff.main.menu.admin.server_admin.conify.copy_status.label;" command="cmd_server_admin_copy_status"/>
- <menuitem label="&staff.main.menu.admin.server_admin.conify.marc_code_maps.label;" command="cmd_server_admin_marc_code"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.conify.marc_record_attrs.label;" command="cmd_server_admin_marc_code"/>
+ <menuitem label="&staff.main.menu.admin.server_admin.conify.coded_value_maps.label;" command="cmd_server_admin_coded_value_map"/>
<menuitem label="&staff.main.menu.admin.server_admin.conify.billing_type.label;" command="cmd_server_admin_billing_type"/>
<menuitem label="&staff.main.menu.admin.server_admin.conify.z3950_source.label;" command="cmd_server_admin_z39_source"/>
<menuitem label="&staff.main.menu.admin.server_admin.conify.circulation_modifier.label;" command="cmd_server_admin_circ_mod"/>
More information about the open-ils-commits
mailing list