[open-ils-commits] r13094 - in trunk/Open-ILS/web: js/dojo/openils/widget vandelay/inc (erickson)

[svn at svn.open-ils.org]

Author: erickson
Date: 2009-05-06 14:52:56 -0400 (Wed, 06 May 2009)
New Revision: 13094

Modified:
   trunk/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js
   trunk/Open-ILS/web/vandelay/inc/queue.xml
Log:
added column picker support for suppressing picker actions on configured columns

Modified: trunk/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js
===================================================================
--- trunk/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js	2009-05-06 18:27:45 UTC (rev 13093)
+++ trunk/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js	2009-05-06 18:52:56 UTC (rev 13094)
@@ -52,13 +52,19 @@
 
                 dojo.forEach(this.getChildren(),
                     function(child) {
-                        for(var i in self.cells) {
-                            var name = self.cells[i].name;
-                            if(name == child.attr('label')) {
-                                child.field = {label:name, ident:self.cells[i].field};
-                                break;
-                            }   
-                        }
+                        dojo.forEach(self.cells,
+                            function(cell) {
+                                if(cell.name == child.attr('label')) {
+                                    if(cell.nonSelectable) {
+                                        console.log("removing child " + child.attr('label'));
+                                        self.removeChild(child);
+                                    } else {
+                                        child.field = {label:name, ident:cell.field};
+                                    }
+                                    return;
+                                }   
+                            }
+                        )
                     }
                 );
                 this.load();

Modified: trunk/Open-ILS/web/vandelay/inc/queue.xml
===================================================================
--- trunk/Open-ILS/web/vandelay/inc/queue.xml	2009-05-06 18:27:45 UTC (rev 13093)
+++ trunk/Open-ILS/web/vandelay/inc/queue.xml	2009-05-06 18:52:56 UTC (rev 13094)
@@ -14,19 +14,26 @@
     function resetVlQueueGridLayout() {
         vlQueueGridLayout = [{
             cells : [[
-                {name: '<input id="vl-queue-grid-row-selector" type="checkbox" onclick="vlToggleQueueGridSelect();"/>', 
-                    get: vlQueueGridDrawSelectBox, styles : 'text-align: center;' },
-                {   name: '&vandelay.view.marc;', 
+                {
+                    name: '<input id="vl-queue-grid-row-selector" type="checkbox" onclick="vlToggleQueueGridSelect();"/>', 
+                    get: vlQueueGridDrawSelectBox, 
+                    styles : 'text-align: center;',
+                    nonSelectable : true
+                }, {   
+                    name: '&vandelay.view.marc;', 
                     get: vlGetViewMARC, styles : 'text-align: center;',
-                    value:'<a href="javascript:void(0);" onclick="vlLoadMARCHtml(RECID, false, '+
-                        'function(){displayGlobalDiv(\'vl-queue-div\');});">&vandelay.view.marc;</a>'
-                },
-                {   name: '&vandelay.matches;', 
+                    value: '<a href="javascript:void(0);" onclick="vlLoadMARCHtml(RECID, false, '+
+                        'function(){displayGlobalDiv(\'vl-queue-div\');});">&vandelay.view.marc;</a>',
+                    nonSelectable : true
+                }, {   
+                    name: '&vandelay.matches;', 
                     get: vlGetViewMatches, styles : 'text-align: center;',
-                    value:'<a href="javascript:void(0);" onclick="vlLoadMatchUI(RECID);">&vandelay.matches;</a>'
-                },
-                {name: '&vandelay.import.time;', field:'import_time',  styles : 'text-align: center;',
-                    get:vlGetDateTimeField, selectableColumn:true}
+                    value:'<a href="javascript:void(0);" onclick="vlLoadMatchUI(RECID);">&vandelay.matches;</a>',
+                    nonSelectable : true
+                }, {
+                    name: '&vandelay.import.time;', field:'import_time',  styles : 'text-align: center;',
+                    get:vlGetDateTimeField, 
+                }
             ]]
         }];
     }