netzke-basepack 0.6.5 → 0.7.0

data/lib/netzke/basepack/grid_panel/javascripts/advanced_search.js

@@ -3,12 +3,9 @@
     if (this.searchWindow) {
       this.searchWindow.show();
     } else {
-      this.loadComponent({name: 'search_form', callback: function(win){
+      this.loadNetzkeComponent({name: 'search_form', callback: function(win){
         this.searchWindow = win;
-        var currentConditionsString = this.getStore().baseParams.extra_conditions;
-        if (currentConditionsString) {
-          win.items.first().getForm().setValues(Ext.decode(currentConditionsString));
-        }
+        win.show();
 
         win.items.first().on('apply', function(){
           win.onSearch();
@@ -18,8 +15,9 @@
         win.on('hide', function(){
           var query = win.getQuery();
           if (win.closeRes == 'search'){
-            this.getStore().baseParams.query = Ext.encode(query);
-            this.getStore().load();
+            var store = this.getStore(), proxy = store.getProxy();
+            proxy.extraParams.query = Ext.encode(query);
+            store.load();
           }
           el.toggle(query.length > 0); // toggle based on the state
         }, this);

data/lib/netzke/basepack/grid_panel/javascripts/check_column_fix.js

@@ -0,0 +1,6 @@
+Ext.override(Ext.ux.CheckColumn, {
+  processEvent: function() {
+    if (this.editable === false) return false;
+    else return this.callOverridden(arguments);
+  }
+});

data/lib/netzke/basepack/grid_panel/javascripts/edit_in_form.js

@@ -2,15 +2,16 @@
   onEditInForm: function(){
     var selModel = this.getSelectionModel();
     if (selModel.getCount() > 1) {
-      var recordId = selModel.getSelected().id;
-      this.loadComponent({name: "multi_edit_form",
+      var recordId = selModel.selected.first().getId();
+      this.loadNetzkeComponent({name: "multi_edit_form",
         params: {record_id: recordId},
         callback: function(w){
+          w.show();
           var form = w.items.first();
           form.on('apply', function(){
             var ids = [];
-            selModel.each(function(r){
-              ids.push(r.id);
+            selModel.selected.each(function(r){
+              ids.push(r.getId());
             });
             if (!form.baseParams) form.baseParams = {};
             form.baseParams.ids = Ext.encode(ids);
@@ -18,18 +19,19 @@
 
           w.on('close', function(){
             if (w.closeRes === "ok") {
-              this.store.reload();
+              this.store.load();
             }
           }, this);
         }, scope: this});
     } else {
-      var recordId = selModel.getSelected().id;
-      this.loadComponent({name: "edit_form",
+      var recordId = selModel.selected.first().getId();
+      this.loadNetzkeComponent({name: "edit_form",
         params: {record_id: recordId},
-        callback: function(form){
-          form.on('close', function(){
-            if (form.closeRes === "ok") {
-              this.store.reload();
+        callback: function(w){
+          w.show();
+          w.on('close', function(){
+            if (w.closeRes === "ok") {
+              this.store.load();
             }
           }, this);
         }, scope: this});
@@ -37,10 +39,11 @@
   },
 
   onAddInForm: function(){
-    this.loadComponent({name: "add_form", callback: function(form){
-      form.on('close', function(){
-        if (form.closeRes === "ok") {
-          this.store.reload();
+    this.loadNetzkeComponent({name: "add_form", callback: function(w){
+      w.show();
+      w.on('close', function(){
+        if (w.closeRes === "ok") {
+          this.store.load();
         }
       }, this);
     }, scope: this});

data/lib/netzke/basepack/grid_panel/javascripts/event_handling.js

@@ -0,0 +1,178 @@
+{
+  // Handler for the 'add' button
+  onAddInline: function(){
+    // Note: default values are taken from the model's field's defaultValue property
+    var r = Ext.ModelManager.create({}, this.id);
+
+    r.isNew = true; // to distinguish new records
+
+    this.getStore().add(r);
+
+    this.tryStartEditing(r);
+  },
+
+  onDel: function() {
+    Ext.Msg.confirm(this.i18n.confirmation, this.i18n.areYouSure, function(btn){
+      if (btn == 'yes') {
+        var records = [];
+        var selection = this.getView().getSelectedNodes();
+        this.getSelectionModel().selected.each(function(r){
+          if (r.isNew) {
+            // this record is not know to server - simply remove from store
+            this.store.remove(r);
+          } else {
+            records.push(r.getId());
+          }
+        }, this);
+
+        if (records.length > 0){
+          if (!this.deleteMask) this.deleteMask = new Ext.LoadMask(this.getEl(), {msg: this.deleteMaskMsg});
+          this.deleteMask.show();
+          // call API
+          this.deleteData({records: Ext.encode(records)}, function(){
+            this.deleteMask.hide();
+          }, this);
+        }
+      }
+    }, this);
+  },
+
+  onApply: function(){
+    var newRecords = [],
+        updatedRecords = [],
+        store = this.getStore();
+
+    Ext.each(store.getUpdatedRecords().concat(store.getNewRecords()),
+      function(r) {
+        if (r.isNew) {
+          newRecords.push(r.data); // HACK: r.data seems private
+        } else {
+          updatedRecords.push(Ext.apply(r.getChanges(), {id:r.getId()}));
+        }
+      },
+    this);
+
+    if (newRecords.length > 0 || updatedRecords.length > 0) {
+      var params = {};
+
+      if (newRecords.length > 0) {
+        params.created_records = Ext.encode(newRecords);
+      }
+
+      if (updatedRecords.length > 0) {
+        params.updated_records = Ext.encode(updatedRecords);
+      }
+
+      if (this.getStore().getProxy().extraParams !== {}) {
+        params.base_params = Ext.encode(this.getStore().getProxy().extraParams);
+      }
+
+      this.postData(params);
+    }
+
+  },
+
+  // Handlers for tools
+  //
+
+  onRefresh: function() {
+    if (this.fireEvent('refresh', this) !== false) {
+      this.store.load();
+    }
+  },
+
+  // Event handlers
+  //
+
+  onColumnResize: function(ct, cl, width){
+    var index = ct.items.findIndex('id', cl.id);
+
+    this.resizeColumn({
+      index: index,
+      size:  width
+    });
+  },
+
+  onColumnHide: function(ct, cl){
+    var index = ct.items.findIndex('id', cl.id);
+
+    this.hideColumn({
+      index:index,
+      hidden:true
+    });
+  },
+
+  onColumnShow: function(ct, cl){
+    var index = ct.items.findIndex('id', cl.id);
+
+    this.hideColumn({
+      index:index,
+      hidden:false
+    });
+  },
+
+  onColumnMove: function(ct, cl, oldIndex, newIndex){
+    this.moveColumn({
+      old_index: oldIndex,
+      new_index: newIndex
+    });
+  },
+
+  onItemContextMenu: function(grid, record, item, rowIndex, e){
+    e.stopEvent();
+    var coords = e.getXY();
+
+    if (!grid.getSelectionModel().isSelected(rowIndex)) {
+      grid.getSelectionModel().selectRow(rowIndex);
+    }
+
+    var menu = new Ext.menu.Menu({
+      items: this.contextMenu
+    });
+
+    menu.showAt(coords);
+  },
+
+  onAfterRowMove: function(dt, oldIndex, newIndex, records){
+    var ids = [];
+    // collect records ids
+    Ext.each(records, function(r){ids.push(r.id)});
+    // call GridPanel's API
+    this.moveRows({ids: Ext.encode(ids), new_index: newIndex});
+  },
+
+  // Other methods. TODO: revise
+  //
+
+  /* Exception handler. TODO: will responses with status 200 land here? */
+  loadExceptionHandler: function(proxy, response, operation){
+    this.netzkeFeedback(response.message);
+    // if (response.status == 200 && (responseObject = Ext.decode(response.responseText)) && responseObject.flash){
+    //   this.feedback(responseObject.flash);
+    // } else {
+    //   if (error){
+    //     this.feedback(error.message);
+    //   } else {
+    //     this.feedback(response.statusText);
+    //   }
+    // }
+  },
+
+  // Inline editing of 1 row
+  onEdit: function(){
+    var row = this.getSelectionModel().selected.first();
+    if (row){
+      this.tryStartEditing(row);
+    }
+  },
+
+  // Not a very clean approach to clean-up. The problem is that this way the advanced search functionality stops being really pluggable. With Ext JS 4 find the way to make it truely so.
+  onDestroy: function(){
+    Netzke.classes.Basepack.GridPanel.superclass.onDestroy.call(this);
+
+    // Destroy the search window (here's the problem: we are not supposed to know it exists)
+    if (this.searchWindow) {
+      this.searchWindow.destroy();
+    }
+  }
+}

data/lib/netzke/basepack/grid_panel/javascripts/grid_panel.js

@@ -5,116 +5,89 @@
 
   componentLoadMask: {msg: "Loading..."},
   deleteMaskMsg: "Deleting...",
+  multiSelect: true,
 
   initComponent: function(){
-    this.plugins = []; // checkbox colums is a special case, being a plugin
-
-    var filters = [];
     var metaColumn;
+    var fields = []; // field configs for the underlying data model
+
+    this.plugins = this.plugins || [];
+    this.features = this.features || [];
+
+    // Enable filters feature
+    this.features.push({
+      encode: true,
+      ftype: 'filters'
+    });
 
     // Run through columns and set up different configuration for each
     Ext.each(this.columns, function(c, i){
-      // We will not use meta columns as actual columns (not even hidden) - only to create the records
-      if (c.meta) {
-        metaColumn = c;
-        return;
-      }
 
-      // Apply default column config
-      Ext.applyIf(c, this.defaultColumnConfig);
+      // Build the field configuration for this column
+      var fieldConfig = {name: c.name, defaultValue: c.defaultValue};
 
-      // setting dataIndex separately
-      c.dataIndex = c.name;
+      if (c.name !== '_meta') fieldConfig.type = this.fieldTypeForAttrType(c.attrType); // field type (grid editors need this to function well)
 
-      // Automatically calculated default values
-      if (!c.header) {c.header = c.label || c.name.humanize()}
+      if (c.attrType == 'datetime') {
+        fieldConfig.dateFormat = 'Y-m-d g:i:s'; // in this format we receive dates from the server
+      };
 
-      // Set initial association values
-      if (this.inlineData) {
-        this.associationValues = this.inlineData.setAssociationValues;
-      }
+      fields.push(fieldConfig);
 
-      // normalize editor
-      this.normalizeEditor(c);
+      // We will not use meta columns as actual columns (not even hidden) - only to create the records
+      if (c.meta) {
+        metaColumn = c;
+        return;
+      }
 
       // if comboboxOptions are provided, we render a combobox instead of textfield
-      if (c.comboboxOptions && c.editor.xtype === "textfield") {
-        c.editor = {xtype: "combobox", options: c.comboboxOptions.split('\\n')}
+      // if (c.comboboxOptions && c.editor.xtype === "textfield") {
+      //   c.editor = {xtype: "combobox", options: c.comboboxOptions.split('\\n')}
+      // }
+
+      this.normalizeRenderer(c);
+
+      // Set rendeder for association columns (the one displaying associations by the specified method instead of id)
+      if (c.assoc) {
+        // Editor for association column
+        c.editor = Ext.apply({
+          parentId: this.id,
+          name: c.name,
+          selectOnFocus: true // ?
+        }, c.editor);
+
+        // Renderer for association column
+        this.normalizeAssociationRenderer(c);
       }
 
-      // collect filters
-      if (c.filterable){
-        filters.push({type: this.filterTypeForAttrType(c.attrType), dataIndex: c.name});
+      if (c.editor) {
+        Ext.applyIf(c.editor, {selectOnFocus: true});
       }
 
-      if (c.editor && c.editor.xtype == 'checkbox') {
-        // Special case of checkbox column
-        var plugin = new Ext.ux.grid.CheckColumn(c);
-        this.plugins.push(plugin);
-        this.columns[i] = plugin;
-      } else {
-        // a "normal" column, not a plugin
-        if (!c.readOnly && !this.prohibitUpdate) {
-          // c.editor contains complete config of the editor
-          c.editor = Ext.apply({
-            parentId: this.id,
-            name: c.name,
-            selectOnFocus: true
-          }, c.editor);
-        } else {
-          c.editor = null;
-        }
-
-        this.normalizeRenderer(c);
-
-        this.setDefaultColumnType(c);
-
-        // Set rendeder for association columns (the one displaying associations by the specified method instead of id)
-        if (c.assoc) {
-          c.scope = this;
-          var passedRenderer = c.renderer; // renderer we got from normalizeRenderer
-          c.renderer = function(value, a, r, ri, ci){
-            var editor = this.getColumnModel().getColumnAt(ci).getEditor();
-            var recordFromStore = editor && editor.getStore && editor.getStore().getById(value);
-            var renderedValue;
-            if (recordFromStore) {
-              renderedValue = recordFromStore.get('field2');
-            } else if (c.assoc && r.get('_meta')) {
-              renderedValue = r.get('_meta').associationValues[c.name] || value;
-            } else {
-              renderedValue = value;
-            }
+      // Setting the default filter type
+      if (c.filterable && !c.filter) {
+        c.filter = {type: this.fieldTypeForAttrType(c.attrType)};
+      }
 
-            return passedRenderer ? passedRenderer.call(this, renderedValue) : renderedValue;
-          };
-        }
+      // setting dataIndex
+      c.dataIndex = c.name;
 
-      }
+      // HACK: somehow this is not set by Ext (while it should be)
+      if (c.xtype == 'datecolumn') c.format = c.format || Ext.util.Format.dateFormat;
 
     }, this);
 
-    /* ... and done with columns */
+    /* ... and done with the columns */
 
-    // Filters
-    this.gridFilters = new Ext.ux.grid.GridFilters({filters:filters, encode: true});
-    if (this.enableColumnFilters) {
-     this.plugins.push(this.gridFilters);
-    }
-
-    // Create Ext.data.Record constructor specific for our particular column configuration
-    this.recordConfig = [];
-    Ext.each(this.columns, function(column){
-      var extraConfig = {};
-      if (column.attrType == 'datetime') {
-        extraConfig.type = 'date';
-        extraConfig.dateFormat = 'Y-m-d g:i:s';
-      };
-      this.recordConfig.push(Ext.apply({name: column.name, defaultValue: column.defaultValue}, extraConfig));
-    }, this);
-    this.Row = Ext.data.Record.create(this.recordConfig);
+    // Define the model
+    Ext.define(this.id, {
+      extend: 'Ext.data.Model',
+      idProperty: this.pri, // Primary key
+      fields: fields
+    });
 
     // After we created the record (model), we can get rid of the meta column
-    this.columns.remove(metaColumn);
+    Ext.Array.remove(this.columns, metaColumn);
 
     // Prepare column model config with columns in the correct order; columns out of order go to the end.
     var colModelConfig = [];
@@ -125,7 +98,6 @@
       Ext.each(this.columns, function(oc) {
         if (c.name === oc.name) {
           mainColConfig = Ext.apply({}, oc);
-          // oc.inOrder = true;
           return false;
         }
       });
@@ -136,100 +108,98 @@
     // We don't need original columns any longer
     delete this.columns;
 
-    // ... instead - define a custom column model
-    this.colModel = new Ext.grid.ColumnModel(colModelConfig);
+    // ... instead, define own column model
+    this.columns = colModelConfig;
+
+    // DirectProxy that uses our Ext.direct provider
+    var proxy = {
+      type: 'direct',
+      directFn: Netzke.providers[this.id].getData,
+      reader: {
+        type: 'array',
+        root: 'data'
+      },
+      listeners: {
+        exception: {
+          fn: this.loadExceptionHandler,
+          scope: this
+        },
+        load: { // Netzke-introduced event; this will also be fired when an exception occurs.
+          fn: function(proxy, response, operation) {
+            // besides getting data into the store, we may also get commands to execute
+            response = response.result;
+            if (response) { // or did we have an exception?
+              Ext.each(['data', 'total', 'success'], function(property){delete response[property];});
+              this.bulkExecute(response);
+            }
+          },
+          scope: this
+        }
+      }
+    }
+
+    this.store = Ext.create('store.store', {
+      model: this.id,
+      proxy: proxy,
+      data: this.inlineData && [this.inlineData.data] || [], // TODO: Inline data *might* contain commands to execute
+      pruneModifiedRecords: true,
+      remoteSort: true,
+      pageSize: this.rowsPerPage
+    });
+
+    // HACK: we must let the store now totalCount, but this property is not public (yet?)
+    this.store.totalCount = this.inlineData && this.inlineData[this.store.getProxy().getReader().totalProperty];
 
     // Drag'n'Drop
     if (this.enableRowsReordering){
       this.ddPlugin = new Ext.ux.dd.GridDragDropRowOrder({
-          scrollable: true // enable scrolling support (default is false)
+        scrollable: true // enable scrolling support (default is false)
       });
       this.plugins.push(this.ddPlugin);
     }
 
-    // DirectProxy that uses our Ext.direct provider
-    this.proxy = new Ext.data.DirectProxy({directFn: Netzke.providers[this.id].getData});
-
-    this.proxy.on('load', function (self, t, options) {
-      // besides getting data into the store, we may also get commands to execute
-      var response = t.result;
-
-      // delete data-related properties
-      Ext.each(['data', 'total', 'success'], function(property){delete response[property];});
-      this.bulkExecute(response);
-    }, this);
-
-    // Data store
-    this.store = this.buildStore();
-
-    // Normalize bottom bar
-    this.bbar = (this.enablePagination) ? new Ext.PagingToolbar(Ext.copyTo({
-      pageSize : this.rowsPerPage,
-      items : this.bbar ? ["-"].concat(this.bbar) : [],
-      store : this.store,
-      emptyMsg: this.i18n.empty,
-      displayInfo: true,
-      plugins: this.gridFilters ? [this.gridFilters] : []
-    }, this.i18n, 'emptyMsg,firstText,prevText,nextText,lastText,beforePageText,afterPageText,refreshText,displayMsg')) : this.bbar;
+    // Cell editing
+    if (!this.prohibitUpdate) {
+      this.plugins.push(Ext.create('Ext.grid.plugin.CellEditing', {pluginId: 'celleditor'}));
+    }
 
-    // Selection model
-    if (!this.sm) this.sm = new Ext.grid.RowSelectionModel();
+    // Paging toolbar
+    this.dockedItems = this.dockedItems || [];
+    this.dockedItems.push({
+      xtype: 'pagingtoolbar',
+      dock: 'bottom',
+      store: this.store,
+      items: ["-"].concat(this.bbar) // append the old bbar. TODO: get rid of it.
+    });
 
-    this.view = this.buildView();
+    delete this.bbar;
 
     // Now let Ext.grid.EditorGridPanel do the rest (original initComponent)
-    Netzke.classes.Basepack.GridPanel.superclass.initComponent.call(this);
-
-    // Persistence-related events
-    if (this.persistence) {
-      // Hidden change event
-      this.getColumnModel().on('hiddenchange', this.onColumnHiddenChange, this);
-
-      // Inform the server part about column operations
-      this.on('columnresize', this.onColumnResize, this);
-      this.on('columnmove', this.onColumnMove, this);
-    }
+    this.callParent();
 
     // Context menu
     if (this.contextMenu) {
-      this.on('rowcontextmenu', this.onRowContextMenu, this);
+      this.on('itemcontextmenu', this.onItemContextMenu, this);
     }
 
     // Disabling/enabling editInForm button according to current selection
-    if (this.enableEditInForm) {
-      this.getSelectionModel().on('selectionchange', function(selModel){
+    if (this.enableEditInForm && !this.prohibitUpdate) {
+      this.getSelectionModel().on('selectionchange', function(selModel, selected){
         var disabled;
-        if (!selModel.hasSelection()) {
+        if (selected.length === 0) { // empty?
           disabled = true;
         } else {
           // Disable "edit in form" button if new record is present in selection
-          disabled = !selModel.each(function(r){
-            if (r.isNew) { return false; }
+          Ext.each(selected, function(r){
+            if (r.isNew) { disabled = true; return false; }
           });
         };
         this.actions.editInForm.setDisabled(disabled);
       }, this);
     }
 
-    // Load data AFTER the toolbar is bound to the store, which will provide for correct page number
-    if (this.loadInlineData) {
-      this.getStore().loadData(this.inlineData);
-
-      // If rows per page specified, fake store.lastOptions as if the data was loaded
-      // by PagingToolbar (for correct functionning of refresh tool and extended search)
-      if (this.rowsPerPage) {
-        this.getStore().lastOptions = {params:{limit:this.rowsPerPage, start:0}}; // this is how PagingToolbar does it...
-      }
-
-      // inlineData may also contain commands (TODO: make it DRY, as this code repeats in multiple places...)
-      // delete data-related properties
-      Ext.each(['data', 'total', 'success'], function(property){ delete this.inlineData[property]; }, this);
-      this.bulkExecute(this.inlineData);
-    }
-
-    // Process selectionchange event
+    // Process selectionchange event to enable/disable actions
     this.getSelectionModel().on('selectionchange', function(selModel){
-      // enable/disable actions
       if (this.actions.del) this.actions.del.setDisabled(!selModel.hasSelection() || this.prohibitDelete);
       if (this.actions.edit) this.actions.edit.setDisabled(selModel.getCount() != 1 || this.prohibitUpdate);
     }, this);
@@ -239,246 +209,79 @@
       this.ddPlugin.on('afterrowmove', this.onAfterRowMove, this);
     }
 
-    // GridView
+    // WIP: GridView
     this.getView().getRowClass = this.defaultGetRowClass;
 
     // When starting editing as assocition column, pre-load the combobox store from the meta column, so that we don't see the real value of this cell (the id of the associated record), but rather the associated record by the configured method.
     this.on('beforeedit', function(e){
-      var column = this.getColumnModel().getColumnById(this.getColumnModel().getColumnId(e.column));
-      if (column.assoc && column.getEditor().isXType('combo') && e.record.get('_meta')) {
-        column.getEditor().getStore().loadData({
-          data: [[e.record.get(e.field), e.record.get('_meta').associationValues[e.field]]]
-        });
+      if (e.column.assoc && e.record.get('_meta')) {
+        var data = [e.record.get(e.field), e.record.get('_meta').associationValues[e.field]],
+            store = e.column.getEditor().store;
+        if (store.getCount() === 0) {
+          store.loadData([data]);
+        }
       }
     }, this);
-  },
-
-  buildStore: function() {
-    return new Ext.data.Store({
-      pruneModifiedRecords: true,
-      proxy: this.proxy,
-      reader: new Ext.data.ArrayReader({root: "data", totalProperty: "total", successProperty: "success", id:0}, this.Row),
-      remoteSort: true,
-      listeners:{'loadexception':{
-        fn:this.loadExceptionHandler,
-        scope:this
-      }}
-    });
-  },
 
-  buildView: function() {
-    return null;
+    this.on('afterrender', function() {
+      // Persistence-related events (afterrender to avoid blank event firing on render)
+      if (this.persistence) {
+        // Inform the server part about column operations
+        this.on('columnresize', this.onColumnResize, this);
+        this.on('columnmove', this.onColumnMove, this);
+        this.on('columnhide', this.onColumnHide, this);
+        this.on('columnshow', this.onColumnShow, this);
+      }
+    }, this);
   },
 
-  filterTypeForAttrType: function(attrType){
+  fieldTypeForAttrType: function(attrType){
     var map = {
-      integer :'Numeric',
-      decimal :'Numeric',
-      datetime:'Date',
-      date    :'Date',
-      string  :'String',
-      'boolean': 'Boolean'
+      integer   : 'int',
+      decimal   : 'float',
+      datetime  : 'date',
+      date      : 'date',
+      string    : 'string',
+      text      : 'string',
+      'boolean' : 'boolean'
     };
-    return map[attrType] || 'String';
+    return map[attrType] || 'string';
   },
 
-  attrTypeEditorMap: {
-    integer  : "numberfield",
-    "float"  : "numberfield",
-    "boolean": "checkbox",
-    decimal  : "numberfield",
-    datetime : "datetimefield",
-    date     : "datefield",
-    string   : "textfield"
+  update: function(){
+    this.store.load();
   },
 
-  setAssociationValues: function(assocObj) {
-    this.associationValues = assocObj;
+  loadStoreData: function(data){
+    var dataRecords = this.getStore().getProxy().getReader().read(data);
+    this.getStore().loadData(dataRecords.records);
+    Ext.each(['data', 'total', 'success'], function(property){delete data[property];}, this);
+    this.bulkExecute(data);
   },
 
-  onAdd: function(){
-      var r = new this.Row();
-      r.isNew = true; // to distinguish new records
-      // r.set('id', r.id); // otherwise later r.get('id') returns empty string
-      this.stopEditing();
-      this.getStore().add(r);
-
-      // Set default values
-      this.getStore().fields.each(function(field){
-        r.set(field.name, field.defaultValue);
-      });
-
-      this.tryStartEditing(this.store.indexOf(r));
-    },
-
-  onDel: function() {
-      Ext.Msg.confirm(this.i18n.confirmation, this.i18n.areYouSure, function(btn){
-        if (btn == 'yes') {
-          var records = [];
-          this.getSelectionModel().each(function(r){
-            if (r.isNew) {
-              // this record is not know to server - simply remove from store
-              this.store.remove(r);
-            } else {
-              records.push(r.id);
-            }
-          }, this);
-
-          if (records.length > 0){
-            if (!this.deleteMask) this.deleteMask = new Ext.LoadMask(this.bwrap, {msg: this.deleteMaskMsg});
-            this.deleteMask.show();
-            // call API
-            this.deleteData({records: Ext.encode(records)}, function(){
-              this.deleteMask.hide();
-            }, this);
-          }
-        }
-      }, this);
-    },
-
-  onApply: function(){
-      var newRecords = [];
-      var updatedRecords = [];
-      Ext.each(this.store.getModifiedRecords(),
-        function(r) {
-          if (r.isNew) {
-            newRecords.push(Ext.apply(r.getChanges(), {id:r.id}));
-          } else {
-            updatedRecords.push(Ext.apply(r.getChanges(), {id:r.id}));
-          }
-        },
-      this);
-
-      if (newRecords.length > 0 || updatedRecords.length > 0) {
-        var params = {};
-
-        if (newRecords.length > 0) {
-          params.created_records = Ext.encode(newRecords);
-        }
-
-        if (updatedRecords.length > 0) {
-          params.updated_records = Ext.encode(updatedRecords);
-        }
-
-        if (this.store.baseParams !== {}) {
-          params.base_params = Ext.encode(this.store.baseParams);
-        }
-
-        this.postData(params);
-      }
-
-    },
-
-  // Handlers for tools
-  //
-
-  onRefresh: function() {
-      if (this.fireEvent('refresh', this) !== false) {
-        this.store.reload();
+  // Tries editing the first editable (i.e. not hidden, not read-only) sell
+  tryStartEditing: function(r){
+    var editableIndex = 0;
+    Ext.each(this.initialConfig.columns, function(c){
+      // skip columns that cannot be edited
+      if (!(c.hidden == true || c.editable == false || !c.editor || c.attrType == 'boolean')) {
+        return false;
       }
-    },
-
-  // Event handlers
-  //
-
-  onColumnResize: function(index, size){
-      this.resizeColumn({
-        index:index,
-        size:size
-      });
-    },
-
-  onColumnHiddenChange: function(cm, index, hidden){
-      this.hideColumn({
-        index:index,
-        hidden:hidden
-      });
-    },
-
-  onColumnMove: function(oldIndex, newIndex){
-      this.moveColumn({
-        old_index:oldIndex,
-        new_index:newIndex
-      });
-
-      var newRecordConfig = [];
-      Ext.each(this.getColumnModel().config, function(c){newRecordConfig.push({name: c.name})});
-      delete this.Row; // old record constructor
-      this.Row = Ext.data.Record.create(newRecordConfig);
-      this.getStore().reader.recordType = this.Row;
-    },
-
-  onRowContextMenu: function(grid, rowIndex, e){
-      e.stopEvent();
-      var coords = e.getXY();
-
-      if (!grid.getSelectionModel().isSelected(rowIndex)) {
-        grid.getSelectionModel().selectRow(rowIndex);
-      }
-
-      var menu = new Ext.menu.Menu({
-        items: this.contextMenu
-      });
-
-      menu.showAt(coords);
-    },
-
-  onAfterRowMove: function(dt, oldIndex, newIndex, records){
-      var ids = [];
-      // collect records ids
-      Ext.each(records, function(r){ids.push(r.id)});
-      // call GridPanel's API
-      this.moveRows({ids:Ext.encode(ids), new_index: newIndex});
-    },
-
-  // Other methods
-  //
+      editableIndex++;
+    });
 
-  loadExceptionHandler: function(proxy, options, response, error){
-    if (response.status == 200 && (responseObject = Ext.decode(response.responseText)) && responseObject.flash){
-      this.feedback(responseObject.flash);
-    } else {
-      if (error){
-        this.feedback(error.message);
-      } else {
-        this.feedback(response.statusText);
-      }
-    }
+    if (editableIndex < this.initialConfig.columns.length) {this.getPlugin('celleditor').startEdit(r, this.columns[editableIndex]);}
   },
 
-  update: function(){
-      this.store.reload();
-    },
-
-  loadStoreData: function(data){
-      this.store.loadData(data);
-      Ext.each(['data', 'total', 'success'], function(property){delete data[property];}, this);
-      this.bulkExecute(data);
-    },
-
-  // try editing the first editable (i.e. not hidden, not read-only) sell
-  tryStartEditing: function(row){
-      var editableIndex = 0;
-      Ext.each(this.getColumnModel().config, function(c){
-        // skip columns that cannot be edited
-        if (!(c.hidden == true || c.editable == false || !c.editor || c.attrType == 'boolean')) {
-          return false;
-        }
-        editableIndex++;
-      });
-
-      if (editableIndex < this.getColumnModel().config.length) {this.startEditing(row, editableIndex);}
-    },
-
   // Called by the server side to update newly created records
   updateNewRecords: function(records){
-      this.updateRecords(records);
-    },
+    this.updateRecords(records);
+  },
 
   // Called by the server side to update modified records
   updateModRecords: function(records){
-      this.updateRecords(records, true);
-    },
+    this.updateRecords(records, true);
+  },
 
   // Updates modified or newly created records, by record ID
   // Example of the records argument (updated columns):
@@ -486,52 +289,52 @@
   // Example of the records argument (new columns, id autogenerated by Ext):
   //   {"ext-record-200" => [1, 'value1', 'value2']}
   updateRecords: function(records, mod){
-      if (!mod) {mod = false;}
-      var modRecordsInGrid = [].concat(this.store.getModifiedRecords()); // there must be a better way to clone an array...
-      // replace arrays of data in the args object with Ext.data.Record objects
-      for (var k in records){
-        records[k] = this.store.reader.readRecords({data:[records[k]]}).records[0];
-      }
-      // for each new record write the data returned by the server, and commit the record
-      Ext.each(modRecordsInGrid, function(recordInGrid){
-        if (mod ^ recordInGrid.isNew) {
-          // if record is new, we access its id by "id", otherwise, the id is in the primary key column
-          var recordId = recordInGrid.id;
-          // new data that the server sent us to update this record (identified by the id)
-          var newData =  records[recordId];
-
-          if (newData){
-            for (var k in newData.data){
-              recordInGrid.set(k, newData.get(k));
-            }
-
-            recordInGrid.isNew = false;
-            recordInGrid.commit();
+    if (!mod) {mod = false;}
+    var modRecordsInGrid = [].concat(this.store.getUpdatedRecords()); // there must be a better way to clone an array...
+    // replace arrays of data in the args object with Ext.data.Record objects
+    for (var k in records){
+      records[k] = this.getStore().getProxy().getReader().read({data:[records[k]]}).records[0];
+    }
+    // for each new record write the data returned by the server, and commit the record
+    Ext.each(modRecordsInGrid, function(recordInGrid){
+      if (mod ^ recordInGrid.isNew) {
+        // if record is new, we access its id by "id", otherwise, the id is in the primary key column
+        var recordId = recordInGrid.getId();
+        // new data that the server sent us to update this record (identified by the id)
+        var newData =  records[recordId];
+
+        if (newData){
+          for (var k in newData.data){
+            recordInGrid.set(k, newData.get(k));
           }
 
+          recordInGrid.isNew = false;
+          recordInGrid.commit();
         }
-      }, this);
 
-      // clear the selections
-      this.getSelectionModel().clearSelections();
+      }
+    }, this);
 
-      // check if there are still records with errors
-      var modRecords = this.store.getModifiedRecords();
-      if (modRecords.length == 0) {
-        // if all records are accepted, reload the grid (so that eventual order/filtering is correct)
-        this.store.reload();
+    // clear the selections
+    this.getSelectionModel().clearSelections();
 
-        // ... and set default getRowClass function
-        this.getView().getRowClass = this.defaultGetRowClass;
-      } else {
-        this.getView().getRowClass = function(r){
-          return r.dirty ? "grid-dirty-record" : ""
-        }
+    // check if there are still records with errors
+    var modRecords = this.store.getUpdatedRecords();
+    if (modRecords.length == 0) {
+      // if all records are accepted, reload the grid (so that eventual order/filtering is correct)
+      this.store.load();
+
+      // ... and set default getRowClass function
+      this.getView().getRowClass = this.defaultGetRowClass;
+    } else {
+      this.getView().getRowClass = function(r){
+        return r.dirty ? "grid-dirty-record" : ""
       }
+    }
 
-      this.getView().refresh();
-      this.getSelectionModel().fireEvent('selectionchange', this.getSelectionModel());
-    },
+    this.getView().refresh();
+    this.getSelectionModel().fireEvent('selectionchange', this.getSelectionModel());
+  },
 
   defaultGetRowClass: function(r){
     return r.isNew ? "grid-dirty-record" : ""
@@ -543,18 +346,6 @@
     this.getSelectionModel().resumeEvents();
   },
 
-  setDefaultColumnType: function(c) {
-    if (c.xtype || c.renderer) return;
-
-    switch (c.attrType) {
-      case 'datetime': {
-        c.xtype = 'datecolumn';
-        c.format = c.format || "Y-m-d g:i:s";
-        break;
-      }
-    }
-  },
-
   // Normalizes the renderer for a column.
   // Renderer may be:
   // 1) a string that contains the name of the function to be used as renderer.
@@ -576,7 +367,7 @@
     var name, args = [];
 
     if ('string' === typeof c.renderer) {
-      name = c.renderer;
+      name = c.renderer.camelize(true);
     } else {
       name = c.renderer[0];
       args = c.renderer.slice(1);
@@ -584,54 +375,39 @@
 
     // First check whether Ext.util.Format has it
     if (Ext.isFunction(Ext.util.Format[name])) {
-       c.renderer = Ext.util.Format[name].createDelegate(this, args, 1);
+       c.renderer = Ext.Function.bind(Ext.util.Format[name], this, args, 1);
     } else if (Ext.isFunction(this[name])) {
       // ... then if our own class has it
-      c.renderer = this[name].createDelegate(this, args, 1);
+      c.renderer = Ext.Function.bind(this[name], this, args, 1);
     } else {
       // ... and, as last resort, evaluate it (allows passing inline javascript function as renderer)
       eval("c.renderer = " + c.renderer + ";");
     }
   },
 
-  normalizeEditor: function(c) {
-    if (c.assoc) {
-    } else {
-      if (c.editor) {
-        c.editor = Ext.isObject(c.editor) ? c.editor : {xtype:c.editor};
+  /*
+  Set a renderer that displayes association values instead of association record ID.
+  The association values are passed in the meta-column under associationValues hash.
+  */
+  normalizeAssociationRenderer: function(c) {
+    c.scope = this;
+    var passedRenderer = c.renderer; // renderer we got from normalizeRenderer
+    c.renderer = function(value, a, r, ri, ci){
+      var column = this.headerCt.items.getAt(ci),
+          editor = column.getEditor && column.getEditor(),
+          // HACK: using private property 'store'
+          recordFromStore = editor && editor.isXType('combobox') && editor.store.findRecord('field1', value),
+          renderedValue;
+
+      if (recordFromStore) {
+        renderedValue = recordFromStore.get('field2');
+      } else if (c.assoc && r.get('_meta')) {
+        renderedValue = r.get('_meta').associationValues[c.name] || value;
       } else {
-        c.editor = {xtype: this.attrTypeEditorMap[c.attrType] || 'textfield'}
+        renderedValue = value;
       }
-    }
 
-  },
-
-  onEdit: function(){
-    var row = this.getSelectionModel().getSelected();
-    if (row){
-      this.tryStartEditing(this.store.indexOf(row));
-    }
-  },
-
-  // Not a very clean approach to clean-up. The problem is that this way the advanced search functionality stops being really pluggable. With Ext JS 4 find the way to make it truely so.
-  onDestroy: function(){
-    Netzke.classes.Basepack.GridPanel.superclass.onDestroy.call(this);
-
-    // Destroy the search window (here's the problem: we are not supposed to know it exists)
-    if (this.searchWindow) {
-      this.searchWindow.destroy();
-    }
+      return passedRenderer ? passedRenderer.call(this, renderedValue) : renderedValue;
+    };
   }
-
-  // :reorder_columns => <<-END_OF_JAVASCRIPT.l,
-  //   function(columns){
-  //     columnsInNewShipment = [];
-  //     Ext.each(columns, function(c){
-  //       columnsInNewShipment.push({name:c});
-  //     });
-  //     newRecordType = Ext.data.Record.create(columnsInNewShipment);
-  //     this.store.reader.recordType = newRecordType; // yes, recordType is a protected property, but that's the only way we can do it, and it seems to work for now
-  //   }
-  // END_OF_JAVASCRIPT
-
 }