From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 1 Apr 2008 20:31:57 +0000 (+0000)
Subject: group perms display now; some display glitches; dojo data propogation issue; getting... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=d9b059ae1ceae6d41b059c2826e425c3b5b87fb9;p=Evergreen.git

group perms display now; some display glitches; dojo data propogation issue; getting closer!

git-svn-id: svn://svn.open-ils.org/ILS/branches/dojo-admin@9185 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/web/conify/global/permission/grp_tree.html b/Open-ILS/web/conify/global/permission/grp_tree.html
index 5d84e1166f..84949bfa9b 100644
--- a/Open-ILS/web/conify/global/permission/grp_tree.html
+++ b/Open-ILS/web/conify/global/permission/grp_tree.html
@@ -3,6 +3,7 @@
 		<title>Confiy :: Global :: Permission :: Group Tree</title>
 
 		<style type="text/css">
+			@import url("/js/dojox/grid/_grid/tundraGrid.css");
 			@import url("/js/dojo/resources/dojo.css");
 			@import url("/js/dijit/themes/tundra/tundra.css");
 			@import url("/js/dojox/widget/Toaster/Toaster.css");
@@ -25,6 +26,18 @@
 				padding-left: 20px;
 				padding-right: 5px;
 			}
+
+            #perm_grid {
+                border: 0px;
+                width: 100%;
+                height: 100%;
+            }
+
+            #grid_container {
+                width: 50%;
+                height: 100%;
+            }
+
 		</style>
 
 		<!-- The OpenSRF API writ JS -->
@@ -97,55 +110,37 @@
                         }
                     }).send();
 
-					function get_perm_part(part, model, row) {
-						var value;
-						perm_store.fetchItemByIdentity({
-							identity : model.getRow(row).perm,
-							onItem : function (item) { value = perm_store.getValue( item, part ) }
-						});
-						return value;
-					}
+                    server.actor.request({
+                        method : 'open-ils.actor.org_types.retrieve',
+                        timeout : 10,
+                        onerror : function (r) { status_update('Problem fetching types') },
+                        oncomplete : function (r) {
+                            window._ou_type_list = r.recv().content();
+                            window._ou_type_data = aout.toStoreData( window._ou_type_list );
+                            window.ou_type_store = new dojo.data.ItemFileReadStore({ data : window._ou_type_data });
+                        }
+                    }).send();
 
-					// XXX Use existing perm grabbing functions??  see old interface
-                    server.pCRUD.request({
-                        method : 'open-ils.permacrud.search.ppl.atomic',
+                    server.actor.request({
+                        method : 'open-ils.actor.permissions.retrieve',
                         timeout : 10,
-                        params : [ ses, { id : { "!=" : null } }, { order_by : { ppl : 'code' } } ],
                         onerror : function (r) { status_update('Problem fetching perms') },
                         oncomplete : function (r) {
     
                             window._perm_list = r.recv().content();
+
                             window._perm_data = ppl.toStoreData( window._perm_list, 'code' );
                             window._perm_name_data = ppl.toStoreData( window._perm_list, 'code', { identifier : 'code' } );
+
                             window.perm_store = new dojo.data.ItemFileWriteStore({ data : window._perm_data });
                             window.perm_name_store = new dojo.data.ItemFileWriteStore({ data : window._perm_name_data });
     
-                            window.current_perm_grid_layout = [
-                                {   cells : [
-                                        [
-                                            {	name : "Depth",
-												field : "perm",
-												width : "5em",
-												noresize : true
-											}, 
-                                            {	name : "Code",
-												//get : dojo.partial(get_perm_part, "code", perm_map_model),
-												width : "300px"
-											},
-                                            {	name : "Description",
-												//get : dojo.partial(get_perm_part, "code", perm_map_model),
-												width : "auto"
-											}
-                                        ]
-                                    ]
-                                }
-                            ];
-    
+   
                         }
                     }).send();
 
                     server.pCRUD.request({
-                        method : 'open-ils.permacrud.search.pgmp.atomic',
+                        method : 'open-ils.permacrud.search.pgpm.atomic',
                         timeout : 10,
                         params : [ ses, { id : { "!=" : null } } ],
                         onerror : function (r) { status_update('Problem fetching perm maps') },
@@ -153,19 +148,9 @@
                             window._perm_map_list = r.recv().content();
                             window._perm_map_data = pgpm.toStoreData( window._perm_map_list, 'id' );
                             window.perm_map_store = new dojo.data.ItemFileWriteStore({ data : window._perm_map_data });
-                        }
-                    }).send();
 
-                    server.pCRUD.request({
-                        method : 'open-ils.permacrud.search.aout.atomic',
-                        timeout : 10,
-                        params : [ ses, { id : { "!=" : null } }, { order_by : { aout : 'depth' } } ],
-                        onerror : function (r) { status_update('Problem fetching types') },
-                        oncomplete : function (r) {
-							window._ou_type_list =  r.recv().content();
-							window._ou_type_data = aout.toStoreData( window._ou_type_list );
-                            window.ou_type_store = new dojo.data.ItemFileWriteStore({ data : window._ou_type_data });
                         }
+ 
                     }).send();
 
 				</script>
@@ -185,6 +170,10 @@
 
 						current_group = item;
 
+						perm_map_model.query = { grp : current_group ? current_group.id[0] : -1 };
+						perm_map_model.refresh();
+						perm_grid.refresh();
+
 						highlighter.editor_pane.green.play();
 						status_update( 'Now editing ' + this.store.getValue( item, 'name' ) );
 
@@ -476,10 +465,63 @@
 					</div>
 
 					<div id="perm_pane" dojoType="dijit.layout.ContentPane" title="Group Permissions">
-						<!--
-						<div dojoType="dojox.grid.data.DojoData" id="perm_data_model"jsId="perm_data_model" rowsPerPage="20" store="perm_store" query="{ code : '*' }"></div>
-						<div id="perm_grid" dojoType="dojox.Grid" model="perm_data_model" structure="perm_grid_layout" jsId="perm_grid"></div>
-						-->
+						<div id="grid_container" dojoType="dijit.layout.ContentPane">
+							<div dojoType="dojox.grid.data.DojoData" id="perm_map_model"jsId="perm_map_model" store="perm_map_store">
+								<script type="dojo/connect" event="startup">
+
+									function get_item_part(model_field, item_search_field, item_part, model, store, row) {
+										if(!model.getRow(row)) return null;
+										var value = null;
+
+										var q = {};
+										q[item_search_field] = model.getRow(row)[model_field];
+
+										store.fetch({
+											query : q,
+											onItem : function (item) { value = store.getValue( item, item_part ) }
+										});
+
+										return value;
+									}
+
+		                            window.current_perm_grid_layout = [
+		                                {   cells : [
+		                                        [
+		                                            {	name : "Code",
+														field: "perm",
+														get : dojo.partial(get_item_part, "perm", "id", "code", perm_map_model, perm_store),
+														width : "300px"
+													},
+		                                            {	name : "Depth",
+														field : "depth",
+														get : dojo.partial(get_item_part, "depth", "depth", "name", perm_map_model, ou_type_store),
+														editor : dojox.grid.editors.ComboBox,
+														options : dojo.map( _ou_type_list, function (x) { return x.name() } ),
+														values : dojo.map( _ou_type_list, function (x) { return x.depth() } )
+													}, 
+		                                            {	name : "Grantable",
+														get : function (row) {
+															var curr = perm_map_model.getRow(row);
+															if (!curr || curr.grantable == 'f') return "No";
+															return "Yes";
+														},
+														field : "grantable",
+														editor : dojox.grid.editors.ComboBox,
+														options : [ "Yes","No" ],
+														value : ['t','f']
+													}
+		                                        ]
+		                                    ]
+		                                }
+		                            ];
+
+									perm_grid.setStructure(current_perm_grid_layout);
+								</script>
+							</div>
+							<div id="perm_grid" dojoType="dojox.Grid" model="perm_map_model" jsId="perm_grid"></div>
+							<!--
+							-->
+						</div>
 					</div>
 
 				</div>
diff --git a/Open-ILS/web/conify/global/permission/grp_tree.js b/Open-ILS/web/conify/global/permission/grp_tree.js
index d80f94b196..c60b0ecfab 100644
--- a/Open-ILS/web/conify/global/permission/grp_tree.js
+++ b/Open-ILS/web/conify/global/permission/grp_tree.js
@@ -16,7 +16,9 @@ dojo.require('dijit.layout.LayoutContainer');
 dojo.require('dijit.layout.SplitContainer');
 dojo.require('dojox.widget.Toaster');
 dojo.require('dojox.fx');
-//dojo.require('dojox.grid.Grid');
+dojo.require('dojox.grid.Grid');
+dojo.require('dojox.grid._data.model');
+dojo.require("dojox.grid.editors");
 
 // some handy globals
 var cgi = new CGI();
diff --git a/Open-ILS/web/conify/js/fieldmapper/hash.js b/Open-ILS/web/conify/js/fieldmapper/hash.js
index e1bdb8b228..448a718e21 100644
--- a/Open-ILS/web/conify/js/fieldmapper/hash.js
+++ b/Open-ILS/web/conify/js/fieldmapper/hash.js
@@ -15,7 +15,7 @@ if(!dojo._hasResource['fieldmapper.hash']){
 	function _toHash () {
 		var _hash = {};
 		for ( var i=0; i < this._fields.length; i++) {
-			if (this[this._fields[i]]())
+			if (this[this._fields[i]]() != null)
 				_hash[this._fields[i]] = '' + this[this._fields[i]]();
 		}
 		return _hash;