[open-ils-commits] r19611 - in trunk/Open-ILS: examples web/templates/default/conify/global/config (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2011-03-07 11:03:14 -0500 (Mon, 07 Mar 2011)
New Revision: 19611

Modified:
   trunk/Open-ILS/examples/fm_IDL.xml
   trunk/Open-ILS/web/templates/default/conify/global/config/coded_value_map.tt2
Log:
default to empty ccvm grid; added crad selector attr and crad/ccvm required attrs to IDL

Modified: trunk/Open-ILS/examples/fm_IDL.xml
===================================================================
--- trunk/Open-ILS/examples/fm_IDL.xml	2011-03-07 16:03:12 UTC (rev 19610)
+++ trunk/Open-ILS/examples/fm_IDL.xml	2011-03-07 16:03:14 UTC (rev 19611)
@@ -573,8 +573,8 @@
 
 	<class id="crad" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="config::record_attr_definition" oils_persist:tablename="config.record_attr_definition" reporter:label="SVF Record Attribute Defintion" oils_persist:field_safe="true">
 		<fields oils_persist:primary="name">
-			<field reporter:label="Name" name="name" reporter:datatype="id"/>
-			<field reporter:label="Label" name="label" reporter:datatype="text"/>
+			<field reporter:label="Name" name="name" reporter:datatype="id" reporter:selector="label"  oils_obj:required="true"/>
+			<field reporter:label="Label" name="label" reporter:datatype="text"  oils_obj:required="true"/>
 			<field reporter:label="Filter?" name="filter" reporter:datatype="bool"/>
 			<field reporter:label="Sorter?" name="sorter" reporter:datatype="bool"/>
 			<field reporter:label="MARC Tag" name="tag" reporter:datatype="text"/>
@@ -626,10 +626,10 @@
 
 	<class id="ccvm" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="config::coded_value_map" oils_persist:tablename="config.coded_value_map" reporter:label="SVF Record Attribute Coded Value Map" oils_persist:field_safe="true">
 		<fields oils_persist:primary="id" oils_persist:sequence="config.coded_value_map_id_seq">
-			<field reporter:label="ID" name="id" reporter:datatype="id"/>
-			<field reporter:label="SVF Attribute" name="ctype" reporter:datatype="link"/>
-			<field reporter:label="Code" name="code" reporter:datatype="text"/>
-			<field reporter:label="Value" name="value" reporter:datatype="text"/>
+			<field reporter:label="ID" name="id" reporter:datatype="id"  oils_obj:required="true"/>
+			<field reporter:label="SVF Attribute" name="ctype" reporter:datatype="link"  oils_obj:required="true"/>
+			<field reporter:label="Code" name="code" reporter:datatype="text"  oils_obj:required="true"/>
+			<field reporter:label="Value" name="value" reporter:datatype="text"  oils_obj:required="true"/>
 			<field reporter:label="Description" name="description" reporter:datatype="text"/>
 		</fields>
 		<links>

Modified: trunk/Open-ILS/web/templates/default/conify/global/config/coded_value_map.tt2
===================================================================
--- trunk/Open-ILS/web/templates/default/conify/global/config/coded_value_map.tt2	2011-03-07 16:03:12 UTC (rev 19610)
+++ trunk/Open-ILS/web/templates/default/conify/global/config/coded_value_map.tt2	2011-03-07 16:03:14 UTC (rev 19611)
@@ -31,7 +31,6 @@
     dojo.require('openils.widget.AutoGrid');
     dojo.require('openils.widget.AutoFieldWidget');
 
-    var firstRun = true;
     openils.Util.addOnLoad(
         function() {
 
@@ -47,12 +46,15 @@
                         function(newVal) {
                             ccvmGrid.resetStore();
                             ccvmGrid.loadAll({order_by : {ccvm : 'code'}}, {ctype : newVal});
+                            ccvmGrid.overrideWidgetArgs.ctype = {dijitArgs : {value : newVal}};
+                            // ^-- why is this not working?
                         }
                     );
-                    // start with something arbitrary that has some data
-                    w.attr('value', 'audience'); 
                 }
             );
+
+            // hide the progress indicator since we're not loading any data up front
+            dojo.style(ccvmGrid.loadProgressIndicator, 'visibility', 'hidden');
         }
     );