Changeset 63

Timestamp:

03/08/10 18:03:28 (2 years ago)

Author:

flow

Message:

Some more fixes, avoided some eval() calls

Files:

• DemoData/trunk/app/views/pages/extbase.ctp (modified) (3 diffs)
• ExtClass/trunk/ext_ux_cakepanel.js (modified) (3 diffs)

DemoData/trunk/app/views/pages/extbase.ctp

@@ -11 +11 @@
         Ext.HOST = '<?php echo $_SERVER['HTTP_HOST']; ?>';
         //set pixel
-        Ext.BLANK_IMAGE_URL = Ext.WEBROOT_DIR+'js/ext-3.0.0/resources/images/default/s.gif';
+        Ext.BLANK_IMAGE_URL = Ext.WEBROOT_DIR+'js/ext-3.1.1/resources/images/default/s.gif';
         
         Ext.QuickTips.init();
@@ -76 +76 @@
         moviesConfig.groupStoreField = 'year';
         moviesConfig.groupStoreSortDirection = 'desc';
-        //moviesConfig.filterBarField = "director_id";
-        //moviesConfig.filterBarStore = 'directors';
+        moviesConfig.filterBarField = "director_id";
+        moviesConfig.filterBarStore = 'directors';
         //moviesConfig.filterBarField = "year";
         //moviesConfig.filterBarStore = {2007:'2007',2003: '2003'};             
-        moviesConfig.filterBarField = "id"; //for habtm this needs to be id not actor_id
-        moviesConfig.filterBarStore = 'actors'; 
+        //moviesConfig.filterBarField = "id"; //for habtm this needs to be id not actor_id
+        //moviesConfig.filterBarStore = 'actors';       
     var movies =   new Ext.ux.CakePanel(moviesConfig);
         //next one, actors config. Here we override the column name in the helper
@@ -95 +95 @@
         directorsConfig.title = "Ye olde directors list";
         //directorsConfig.groupStoreField = "alive"; could group by alive
+        directorsConfig.filterBarField = 'id';
+        directorsConfig.filterBarStore = 'movies';
     var directors =   new Ext.ux.CakePanel(directorsConfig);
         //we'll use a viewport to display a TabPanel.

ExtClass/trunk/ext_ux_cakepanel.js

@@ -291 +291 @@
                                                 //if we pass a object by hand, then that is used
                                                 if (typeof(this.filterBarStore) == "string") { //reference                                                      
-                                                        var habtm = eval('this.dataStore.data.items[0].data.' + this.filterBarStore);
-                                                        if (typeof(habtm) == "object") {//has many assoc, we need to search in sub-store
-                                                                this.dataStore.filterBy(function(store_el) {                                                    
-                                                                        var habtm_raw = eval('store_el.data.' + this.filterBarStore);
+                                                        if (typeof(this.dataStore.data.items[0].data[this.filterBarStore]) == "object") {//has many assoc, we need to search in sub-store
+                                                                this.dataStore.filterBy(function(store_el) {
+                                                                        if (Ext.isEmpty(el.value)) return true; //reset filter if empty                                                         
                                                                         var found = false;
-                                                                        for (i=0;i<habtm_raw.length;i++) {
-                                                                                var temp = habtm_raw[i];
-                                                                                if (eval('temp.'+this.filterBarField) == el.value) found = true;
+                                                                        for (i=0;i<store_el.data[this.filterBarStore].length;i++) {
+                                                                                if (store_el.data[this.filterBarStore][i][this.filterBarField] == el.value) found = true;
                                                                         }
                                                                         return found;
                                                                 },this)                                                         
                                                         } else {
-                                                                var mapping = eval('this.dataStore.reader.jsonData.' + this.filterBarStore);
-                                                                this.dataStore.filter(this.filterBarField,mapping[el.value]);
+                                                                this.dataStore.filter(this.filterBarField,this.dataStore.reader.jsonData[this.filterBarStore][el.value]);
                                                         }                               
                                                 } else { //manually passed object
@@ -501 +498 @@
                 getComboValues: function(name,store) {
                         if (typeof(name) == "string") {
-                                var comboData = eval('store.reader.jsonData.' + name);
-                                comboData = Ext.ux.CakeHelper.flattenObject(comboData);
+                                comboData = Ext.ux.CakeHelper.flattenObject(store.reader.jsonData[name]);
                         } else {
                                 var comboData = Ext.ux.CakeHelper.flattenObject(name);
@@ -517 +513 @@
                                 var output = '<ul>';
                                 for (value in values) {                                                                         
-                                        if (isFinite(value)) output += '<li>'+(this.remap ? eval('values[value].'+this.remap) : values[value].name)+'</li>';
+                                        if (isFinite(value)) output += '<li>'+(this.remap ? values[value][this.remap] : values[value].name)+'</li>';
                                 }
                                 output += '</ul>';