netzke-basepack 0.6.3 → 0.6.4

data/lib/netzke/basepack/form_panel/fields.rb

@@ -22,7 +22,7 @@ module Netzke
 
         # Hash of fully configured fields, that are referenced in the items. E.g.:
         #   {
-        #     :role__name => {:xtype => 'combobox', :disabled => true, :value => "admin"},
+        #     :role__name => {:xtype => 'netzkeremotecombo', :disabled => true, :value => "admin"},
         #     :created_at => {:xtype => 'datetime', :disabled => true, :value => "2010-10-10 10:10"}
         #   }
         def fields
@@ -52,7 +52,7 @@ module Netzke
 
         # Hash of normalized field configs extracted from :items, e.g.:
         #
-        #     {:role__name => {:xtype => "combobox"}, :password => {:xtype => "passwordfield"}}
+        #     {:role__name => {:xtype => "netzkeremotecombo"}, :password => {:xtype => "passwordfield"}}
         def fields_from_config
           items if @fields_from_config.nil? # by calling +items+ we initiate building of @fields_from_config
           @fields_from_config ||= {}
@@ -64,7 +64,7 @@ module Netzke
           def meta_columns
             [
               {:name => "included", :attr_type => :boolean, :width => 40, :header => "Incl", :default_value => true},
-              {:name => "name", :attr_type => :string, :editor => :combobox, :width => 200},
+              {:name => "name", :attr_type => :string, :editor => :netzkeremotecombo, :width => 200},
               {:name => "label", :attr_type => :string, :header => "Label"},
               {:name => "default_value", :attr_type => :string}
             ]
@@ -98,13 +98,13 @@ module Netzke
             detect_association_with_method(field) # xtype for an association field
             set_default_field_label(field)
             set_default_field_xtype(field) if field[:xtype].nil?
-            set_default_field_value(field) if self.record
+            # set_default_field_value(field) if self.record
             set_default_read_only(field)
 
             field[:display_mode] = config[:display_mode] if config[:display_mode]
 
             # provide our special combobox with our id
-            field[:parent_id] = self.global_id if field[:xtype] == :combobox
+            field[:parent_id] = self.global_id if field[:xtype] == :netzkeremotecombo
 
             field[:hidden] = field[:hide_label] = true if field[:hidden].nil? && primary_key_attr?(field)
 
@@ -122,12 +122,10 @@ module Netzke
               if method && assoc = data_class.reflect_on_association(assoc_name)
                 assoc_column = assoc.klass.columns_hash[method.to_s]
                 assoc_method_type = assoc_column.try(:type)
-                if assoc_method_type
-                  if c[:nested_attribute]
-                    c[:xtype] ||= xtype_for_attr_type(assoc_method_type)
-                  else
-                    c[:xtype] ||= assoc_method_type == :boolean ? xtype_for_attr_type(assoc_method_type) : xtype_for_association
-                  end
+                if c[:nested_attribute]
+                  c[:xtype] ||= xtype_for_attr_type(assoc_method_type)
+                else
+                  c[:xtype] ||= assoc_method_type == :boolean ? xtype_for_attr_type(assoc_method_type) : xtype_for_association
                 end
               end
             end
@@ -161,10 +159,10 @@ module Netzke
             c[:field_label].gsub!(/\s+/, " ")
           end
 
-          def set_default_field_value(field)
-            value = record.value_for_attribute(field)
-            field[:value] ||= value unless value.nil?
-          end
+          # def set_default_field_value(field)
+          #   value = record.value_for_attribute(field)
+          #   field[:value] ||= value unless value.nil?
+          # end
 
           # Deeply merges only those key/values at the top level that are already there
           def deep_merge_existing_fields(dest, src)
@@ -191,7 +189,7 @@ module Netzke
               :integer => :numberfield,
               :boolean => :checkbox,
               :date => :datefield,
-              :datetime => :xdatetime,
+              :datetime => :datetimefield,
               :text => :textarea,
               :json => :jsonfield,
               :string => :textfield
@@ -203,7 +201,7 @@ module Netzke
           end
 
           def xtype_for_association
-            :combobox
+            :netzkeremotecombo
           end
 
           # Are we provided with a static field layout?

data/lib/netzke/basepack/form_panel/javascripts/comma_list_cbg.js

@@ -53,7 +53,14 @@ Ext.netzke.form.CommaListCbg = Ext.extend(Ext.form.CheckboxGroup, {
     } else {
       Ext.netzke.form.CommaListCbg.superclass.setValue.call(this, arguments);
     }
+  },
+
+  setReadonlyMode: function(onOff) {
+    this.items.each(function(i){
+      i.setReadonlyMode(onOff);
+    });
   }
+
 });
 
 Ext.reg('commalistcbg', Ext.netzke.form.CommaListCbg);

data/lib/netzke/basepack/form_panel/javascripts/display_mode.js

@@ -27,6 +27,12 @@ Ext.override(Ext.form.Field, {
 
 });
 
+Ext.override(Ext.netzke.ComboBox, {
+  displayModeConfig: function(onOff){
+    return Ext.apply(this.initialConfig, onOff ? {xtype: 'displayfield', origXtype: this.xtype, value: this.getRawValue(), origValue: this.getValue()} : {xtype: this.origXtype, value: this.origValue});
+  }
+});
+
 Ext.override(Ext.netzke.form.NRadioGroup, {
   setDisplayMode: function(onOff){
     this.items.each(function(i){

data/lib/netzke/basepack/form_panel/javascripts/{main.js → form_panel.js}

@@ -22,29 +22,32 @@
     // Now let Ext.form.FormPanel do the rest
     Netzke.classes.Basepack.FormPanel.superclass.initComponent.call(this);
 
-    // Apply event
+    // To inform the parent about the apply event
     this.addEvents('apply');
   },
 
   afterRender: function(){
     Netzke.classes.Basepack.FormPanel.superclass.afterRender.call(this);
 
+    // have a record to be displayed?
+    if (this.record) { this.setFormValues(this.record); }
+
     // render in display mode?
-    if (this.locked) this.setDisplayMode(true);
+    if (this.locked) this.setReadonlyMode(true);
   },
 
   onEdit: function(){
-    this.setDisplayMode(false);
+    this.setReadonlyMode(false);
   },
 
   onCancel: function(){
-    this.setDisplayMode(true, true);
+    this.setReadonlyMode(true, true);
   },
 
   updateToolbar: function(){
     var tbar = this.getBottomToolbar();
 
-    if (this.inDisplayMode) {
+    if (this.inReadonlyMode) {
       var buttonIndex = tbar.items.findIndex("name", "apply");
       var buttonToRemove = tbar.items.itemAt(buttonIndex);
       if (buttonToRemove) {
@@ -73,7 +76,7 @@
 
   onApply: function() {
     if (this.fireEvent('apply', this)) {
-      var values = this.getForm().getValues();
+      var values = this.getForm().getFieldValues();
 
       // do not send values from disabled fields and empty values
       for (var fieldName in values) {
@@ -88,7 +91,7 @@
       if (this.fileUpload) {
         // Not a Netzke's standard endpoint call, because the form is multipart
         this.getForm().submit({
-          url: this.endpointUrl("netzke_submit"),
+          api: {submit: Netzke.providers[this.parentId].netzkeSubmit},
           params: {
             data: Ext.encode(values)
           },
@@ -105,7 +108,7 @@
         this.netzkeSubmit(Ext.apply((this.baseParams || {}), {data:Ext.encode(values)}), function(result){
           if (result === "ok") {
             this.fireEvent("submitsuccess");
-            if (this.mode == "lockable") this.setDisplayMode(true);
+            if (this.mode == "lockable") this.setReadonlyMode(true);
           };
           if (this.applyMaskCmp) this.applyMaskCmp.hide();
         }, this);
@@ -114,6 +117,19 @@
   },
 
   setFormValues: function(values){
+    var assocValues = values._meta.associationValues || {};
+    for (var assocFieldName in assocValues) {
+      var assocField = this.find('name', assocFieldName)[0];
+      if (this.inDisplayMode) {
+        assocField.origValue = values[assocFieldName];
+        assocField.setValue(assocValues[assocFieldName]);
+        delete values[assocFieldName]; // we don't want this to be set once more below with setValues()
+      } else {
+        assocField.getStore().loadData({data: [[values[assocFieldName], assocValues[assocFieldName]]]});
+        delete assocField.lastQuery; // force loading the store next time user clicks the trigger
+      }
+    }
+
     this.getForm().setValues(values);
   },
 
@@ -126,13 +142,31 @@
     this.updateToolbar();
   },
 
+  setReadonlyMode: function(onOff, cancel){
+    if (this.inReadonlyMode == onOff) return;
+    this.getForm().items.each(function(i){i.setReadonlyMode(onOff);});
+    // this.getForm().cleanDestroyed(); // because fields inside of composite fields are not auto-cleaned!
+    this.doLayout();
+    this.inReadonlyMode = onOff;
+    this.updateToolbar();
+  },
+
   // recursively extract field names
   extractFields: function(items){
     Ext.each(items, function(i){
       if (i.items) {this.extractFields(i.items);}
       else if (i.name) {this.fieldNames.push(i.name);}
     }, this);
+  },
 
+  applyFormErrors: function(errors) {
+    var field;
+    Ext.iterate(errors, function(fieldName, message){
+      fieldName = fieldName.underscore();
+      if ( field = this.getForm().findField(fieldName) || this.getForm().findField(fieldName.replace(/([a-z]+)([0-9])/g, '$1_$2'))) {
+        field.markInvalid(message.join('<br/>'));
+      }
+    }, this);
   }
 
 }

data/lib/netzke/basepack/form_panel/javascripts/n_radio_group.js

@@ -1,24 +1,41 @@
 Ext.ns("Ext.netzke.form");
-
 /*
 A very simple RadioGroup extension.
 Config options:
-* options - all radio buttons, by boxLabel, e.g.: ["Cool", "To read", "Important"]
+* options:
+  1) all radio buttons, by boxLabel, e.g.: ["Cool", "To read", "Important"]
+  2) array of arrays in format [value, label], e.g.: [[1, "Good"], [2, "Average"], [3, "Poor"]]
 */
 Ext.netzke.form.NRadioGroup = Ext.extend(Ext.form.RadioGroup, {
-  // defaultType: 'radio',
-  // groupCls : 'x-form-radio-group',
-
   initComponent: function(){
     Ext.netzke.form.NRadioGroup.superclass.initComponent.call(this);
 
     this.items = [];
 
     Ext.each(this.options, function(o){
-      this.items.push({boxLabel: o, name: this.name, inputValue: o});
+      if (Ext.isArray(o)){
+        this.items.push({boxLabel: o[1], name: this.name, inputValue: o[0]});
+      } else {
+        this.items.push({boxLabel: o, name: this.name, inputValue: o});
+      }
     }, this);
 
-    delete this.name;
+    // delete this.name;
+  },
+
+  getValue: function() {
+    var value;
+    this.items.each(function(i) {
+      value = i.inputValue;
+      return !i.getValue();
+    });
+    return value;
+  },
+
+  setReadonlyMode: function(onOff) {
+    this.items.each(function(i){
+      i.setReadonlyMode(onOff);
+    });
   }
 });
 

data/lib/netzke/basepack/form_panel/javascripts/readonly_mode.js

@@ -0,0 +1,52 @@
+Ext.override(Ext.form.Field, {
+
+  // By calling this, the field is instructed to replace itself with another instance, configured with displayModeConfig
+  setReadonlyMode: function(onOff){
+    if (this.hidden) return;
+
+    this.setReadOnly(onOff);
+
+    if (onOff) {
+      this.addClass("readonly");
+      if (this.label) this.label.addClass("readonly");
+    } else {
+      this.removeClass("readonly");
+      if (this.label) this.label.removeClass("readonly");
+    }
+    // var owner = this.ownerCt;
+    // var newConfig = this.readonlyModeConfig(onOff);
+    //
+    // var idx = this.removeSelf();
+    // owner.insert(idx, newConfig);
+    //
+    // this.destroy();
+  },
+
+  // Remove self from the container
+  // removeSelf: function(){
+  //   var idx = this.ownerCt.items.indexOf(this);
+  //   this.ownerCt.remove(this);
+  //   return idx;
+  // },
+
+  // Config for creating an instance in "displayMode" (if onOff is true), or normal mode (if onOff is false)
+  // displayModeConfig: function(onOff){
+  //   return Ext.apply(this.initialConfig, onOff ? {xtype: 'displayfield', origXtype: this.xtype, value: this.getValue()} : {xtype: this.origXtype, value: this.getValue()});
+  // }
+
+});
+
+// Composite field has to take care of its children, by setting them into the "display mode"
+Ext.override(Ext.form.CompositeField, {
+  setReadonlyMode: function(onOff){
+    this.items.each(function(i){
+      i.setReadonlyMode(onOff);
+    });
+  }
+});
+
+Ext.override(Ext.form.Checkbox, {
+  setReadonlyMode: function(onOff){
+    this.setDisabled(onOff);
+  }
+});

data/lib/netzke/basepack/form_panel/services.rb

@@ -51,18 +51,44 @@ module Netzke
           success = create_or_update_record(data)
 
           if success
-            {:set_form_values => values.each_pair.inject({}){ |r,(k,v)| r.merge(k.l => v) }, :set_result => "ok"}
+            {:set_form_values => js_record_data, :set_result => "ok"}
           else
             # flash eventual errors
             @record.errors.to_a.each do |msg|
               flash :error => msg
             end
-            {:feedback => @flash}
+            # {:feedback => @flash}
+            {:feedback => @flash, :apply_form_errors => build_form_errors(record)}
           end
         end
 
         private
 
+          # Builds the form errors
+          def build_form_errors(record)
+            form_errors = {}
+            foreign_keys = {}
+
+            # Build a hash of foreign keys and the associated model
+            data_class.reflect_on_all_associations(:belongs_to).map{ |r|
+              foreign_keys[r.association_foreign_key.to_sym] = r.name
+            }
+
+            record.errors.map{|field, error|
+              # Get the correct field name for the errors on foreign keys
+              if foreign_keys.has_key?(field)
+                fields.each do |k, v|
+                  # Hack to stop to_nifty_json from camalizing model__field
+                  field = k.to_s.gsub('__', '____') if k.to_s.split('__').first == foreign_keys[field].to_s
+                end
+              end
+
+              form_errors[field] ||= []
+              form_errors[field] << error
+            }
+            form_errors
+          end
+
           # Creates/updates a record from hash
           def create_or_update_record(hsh)
 

data/lib/netzke/basepack/form_panel/stylesheets/readonly_mode.css

@@ -0,0 +1,14 @@
+input.readonly, textarea.readonly {
+  background-color: #f5f5f5;
+  background-image: none;
+}
+
+/*input.readonly, textarea.readonly {
+  border: 0 solid #fff;
+  background-image: none;
+}
+
+label.readonly {
+  font-weight: bold;
+}
+*/

data/lib/netzke/basepack/grid_panel.rb

@@ -1,49 +1,29 @@
 require "netzke/basepack/grid_panel/columns"
 require "netzke/basepack/grid_panel/services"
 # require "netzke/basepack/plugins/configuration_tool"
-# require "data_accessor"
 
 module Netzke
   module Basepack
-    # = GridPanel
-    #
     # Ext.grid.EditorGridPanel-based component with the following features:
     #
+    # * ActiveRecord-model support with automatic column configuration
     # * multi-line CRUD operations - get, post, delete, create
     # * (multe-record) editing and adding records through a form
-    # * column resize, move and hide
+    # * persistent column resize, move and hide
     # * permissions
     # * sorting
     # * pagination
     # * filtering
-    # * extended search
-    # * (TODO) rows reordering (drag-n-drop)
+    # * advanced search
+    # * rows reordering by drag-n-drop, requires acts_as_list on the model
+    # * virtual attribute support
     # * (TODO) dynamic configuration of properties and columns
     #
-    # == Class configuration
-    #
-    # Configuration on this level is effective during the life-time of the application. The right place for setting these options are in
-    # config/initializers, e.g.:
-    #
-    #     Netzke::GridPanel.column_filters_available = false
-    #     Netzke::GridPanel.default_config = {:enable_config_tool => false}
-    #
-    # Most of these options influence the amount of JavaScript code that is generated for this component's class, in the way that
-    # the less functionality is enabled, the less code is generated.
-    #
-    # The following configuration options are available:
-    # * <tt>:column_filters_available</tt> - (default is true) include code for the filters in the column's context menu
-    # * (TODO)<tt>:config_tool_available</tt> - (default is true) include code for the configuration tool that launches the configuration panel
-    # * <tt>:edit_in_form_available</tt> - (defaults to true) include code for (multi-record) editing and adding records through a form
-    # * <tt>:extended_search_available</tt> - (defaults to true) include code for extended configurable search
-    # * <tt>:default_config</tt> - a hash of default configuration options for each instance of the GridPanel component.
-    # See the "Instance configuration" section below.
-    #
     # == Instance configuration
-    # The following config options are available:
-    # * <tt>:model</tt> - name of the ActiveRecord model that provides data to this GridPanel.
-    # * <tt>:strong_default_attrs</tt> - a hash of attributes to be merged atop of every created/updated record.
-    # * <tt>:scope</tt> - specifies how the data should be filtered.
+    # The following config options are supported:
+    # * +model+ - name of the ActiveRecord model that provides data to this GridPanel, e.g. "User"
+    # * +columns+ - an array of columns to be displayed in the grid; each column may be represented by a symbol (representing the model's attribute name), or a hash (when extra configuration is needed). See the "Columns" section below.
+    # * +scope+ - specifies how the data should be filtered.
     #   When it's a symbol, it's used as a scope name.
     #   When it's a string, it's a SQL statement (passed directly to +where+).
     #   When it's a hash, it's a conditions hash (passed directly to +where+).
@@ -55,28 +35,33 @@ module Netzke
     #
     #     :scope => { |rel| rel.where(:id.gt => 100).order(:created_at) }
     #
-    # * <tt>:enable_column_filters</tt> - enable filters in column's context menu
-    # * <tt>:enable_edit_in_form</tt> - provide buttons into the toolbar that activate editing/adding records via a form
-    # * <tt>:enable_extended_search</tt> - provide a button into the toolbar that shows configurable search form
-    # * <tt>:enable_context_menu</tt> - enable rows context menu
-    # * <tt>:enable_rows_reordering</tt> - enable reordering of rows with drag-n-drop; underlying model (specified in <tt>:model</tt>) must implement "acts_as_list"-compatible functionality; defaults to <tt>false</tt>
-    # * <tt>:enable_pagination</tt> - enable pagination; defaults to <tt>true</tt>
-    # * <tt>:rows_per_page</tt> - number of rows per page (ignored when <tt>:enable_pagination</tt> is set to <tt>false</tt>)
-    # * <tt>:load_inline_data</tt> - load initial data into the grid right after its instantiation (saves a request to server); defaults to <tt>true</tt>
-    # * (TODO) <tt>:mode</tt> - when set to <tt>:config</tt>, GridPanel loads in configuration mode
-    # * <tt>:add/edit/multi_edit/search_form_config</tt> - additional configuration for add/edit/multi_edit/search form panel
-    # * <tt>:add/edit/multi_edit_form_window_config</tt> - additional configuration for the window that wrapps up add/edit/multi_edit form panel
-    # * <tt>:columns</tt> - an array of columns to be displayed in the grid; each column may be represented by a symbol (representing the model's attribute name), or a hash (when extra configuration is needed)
+    # * +strong_default_attrs+ - (defaults to {}) a hash of attributes to be merged atop of every created/updated record, e.g. {:role_id => 1}
+    # * +enable_column_filters+ - (defaults to true) enable filters in column's context menu
+    # * +enable_edit_in_form+ - (defaults to true) provide buttons into the toolbar that activate editing/adding records via a form
+    # * +enable_extended_search+ - (defaults to true) provide a button into the toolbar that shows configurable search form
+    # * +enable_context_menu+ - (defaults to true) enable rows context menu
+    # * +enable_rows_reordering+ - (defaults to false) enable reordering of rows with drag-n-drop; underlying model (specified in +model+) must implement "acts_as_list"-compatible functionality
+    # * +enable_pagination+ - (defaults to true) enable pagination
+    # * +rows_per_page+ - (defaults to 30) number of rows per page (ignored when +enable_pagination+ is set to <tt>false+)
+    # * +load_inline_data+ - (defaults to true) load initial data into the grid right after its instantiation
+    # * (TODO) +mode+ - when set to +config+, GridPanel loads in configuration mode
+    # * +add/edit/multi_edit/search_form_config+ - additional configuration for add/edit/multi_edit/search form panel
+    # * +add/edit/multi_edit_form_window_config+ - additional configuration for the window that wrapps up add/edit/multi_edit form panel
     #
     # == Columns
-    # Columns are configured by passing an array to the +columns+ option. Each element in the array is either the name of model's (virtual) attribute, or a column configuration hash.
-    # The column configuration hash recognizes the following options:
+    # Columns are configured by passing an array to the +columns+ option. Each element in the array is either the name of model's (virtual) attribute (in which case the configuration will be fully automatic), or a hash that may contain the following configuration options as keys:
     #
-    # * +name+ - name of the column, that may correspond to model's (virtual) attribute
+    # * +name+ - name of the column, that may correspond to the model's (virtual) attribute
     # * +read_only+ - a boolean that defines if the cells in the column should be editable
     # * +editable+ - same as +read_only+, but in reverse (takes precedence over +read_only+)
-    # * +getter+ - a lambda that receives a record as a parameter, and is expected to return a string that will be printed in the cell (can be HTML code)
-    # * +setter+ - a lambda that receives a record as first parameter, and the value passed from the cell as the second parameter, and is expected to modify the record accordingly
+    # * +filterable+ - set to false to disable filtering on this column
+    # * +getter+ - a lambda that receives a record as a parameter, and is expected to return a string that will be sent to the cell (can be HTML code), e.g.:
+    #
+    #     :getter => lambda {|r| [r.first_name, r.last_name].join }
+
+    # * +setter+ - a lambda that receives a record as first parameter, and the value passed from the cell as the second parameter, and is expected to modify the record accordingly, e.g.:
+    #
+    #     :setter => lambda { |r,v| r.first_name, r.last_name = v.split(" ") }
     #
     # * +sorting_scope+ - the name of the scope used for sorting the column. This can be useful for virtual columns for example. The scope will get one parameter specifying the direction (:asc or :desc). Example:
     #
@@ -87,138 +72,127 @@ module Netzke
     #         order("users.first_name #{dir.to_s}, users.last_name #{dir.to_s}")
     #       }
     #     end
+    #
     # Besides these options, a column can receive any meaningful config option understood by Ext.grid.Column (http://dev.sencha.com/deploy/dev/docs/?class=Ext.grid.Column)
     #
     # == Actions
-    # You can override GridPanel's actions to change their text, icons, and tooltips (see http://api.netzke.org/core/Netzke/Actions.html). You can also use these actions when configuring menus and toolbars.
+    # You can override GridPanel's actions to change their text, icons, and tooltips (see http://api.netzke.org/core/Netzke/Actions.html).
+    #
     # GridPanel implements the following actions:
-    # * +add+
-    # * +del+
-    # * +edit+
-    # * +apply+
-    # * +add_in_form+
-    # * +edit_in_form+
-    # * +search+
+    # * +add+ - inline adding of a record
+    # * +del+ - deletion of records
+    # * +edit+ - inline editing of a record
+    # * +apply+ - applying inline changes
+    # * +add_in_form+ - adding a record in a form
+    # * +edit_in_form+ - (multi-record) editing in a forrm
+    # * +search+ - advanced searching
+    #
+    # == Class configuration
+    #
+    # Configuration on this level is effective during the life-time of the application. One place for setting these options are in application.rb, e.g.:
+    #
+    #     config.netzke.basepack.grid_panel.column_filters_available = false
+    #
+    # These can also be eventually set directly on the component's class:
+    #
+    #     Netzke::Basepack::GridPanel.column_filters_available = false
+    #
+    # Most of these options influence the amount of JavaScript code that is generated for this component's class, in the way that the less functionality is enabled, the less code is generated.
+    #
+    # The following class configuration options are available:
+    # * +column_filters_available+ - (defaults to true) include code for the filters in the column's context menu
+    # * (TODO)+config_tool_available+ - (defaults to true) include code for the configuration tool that launches the configuration panel
+    # * +edit_in_form_available+ - (defaults to true) include code for (multi-record) editing and adding records through a form
+    # * +extended_search_available+ - (defaults to true) include code for extended configurable search
     class GridPanel < Netzke::Base
+      js_base_class "Ext.grid.EditorGridPanel"
+
       # Class-level configuration. These options directly influence the amount of generated
       # javascript code for this component's class. For example, if you don't want filters for the grid,
       # set column_filters_available to false, and the javascript for the filters won't be included at all.
-      class_attribute :column_filters_available
-      self.column_filters_available = true
+      class_config_option :column_filters_available, true
 
-      class_attribute :config_tool_available
-      self.config_tool_available = true
+      class_config_option :extended_search_available, true
 
-      class_attribute :edit_in_form_available
-      self.edit_in_form_available = true
+      class_config_option :edit_in_form_available, true
 
-      class_attribute :extended_search_available
-      self.extended_search_available = true
+      class_config_option :rows_reordering_available, true
 
-      class_attribute :rows_reordering_available
-      self.rows_reordering_available = true
+      class_config_option :config_tool_available, true
 
-      class_attribute :default_config
-      self.default_config = {
-        :enable_edit_in_form    => true,
-        :enable_extended_search => true,
-        :enable_column_filters  => true,
+      class_config_option :default_instance_config, {
+        :enable_edit_in_form    => edit_in_form_available,
+        :enable_extended_search => extended_search_available,
+        :enable_column_filters  => column_filters_available,
         :load_inline_data       => true,
         :enable_rows_reordering => false, # column drag n drop
         :enable_pagination      => true,
-        :rows_per_page          => 25,
+        :rows_per_page          => 30,
         :tools                  => %w{ refresh },
       }
 
+      extend ActiveSupport::Memoizable
+
       include self::Services
       include self::Columns
+      include Netzke::Basepack::DataAccessor
 
-      include Netzke::DataAccessor
-
-      # def self.enforce_config_consistency
-      #   default_config[:enable_edit_in_form]    &&= edit_in_form_available
-      #   default_config[:enable_extended_search] &&= extended_search_available
-      #   default_config[:enable_rows_reordering] &&= rows_reordering_available
-      # end
-
-      # def initialize(*args)
-      #   # Deprecations
-      #   config[:scopes] && ActiveSupport::Deprecation.warn(":scopes option is not effective any longer for GridPanel. Use :scope instead.")
-      #
-      #   super(*args)
-      # end
-
-      js_base_class "Ext.grid.EditorGridPanel"
-      js_mixin :main
+      js_mixin :grid_panel
       js_mixin :advanced_search if extended_search_available
       js_mixin :edit_in_form if edit_in_form_available
 
-      # I18n used in JavaScript
-      js_property :i18n, {
-        :are_you_sure => I18n.translate("netzke.basepack.generic.are_you_sure"),
-        :confirm => I18n.translate("netzke.basepack.generic.confirm")
-      }
-
-      # Include extra javascript that we depend on
-      def self.include_js
-        res = []
-        ext_examples = Netzke::Core.ext_location.join("examples")
-
-        # Checkcolumn
-        res << ext_examples.join("ux/CheckColumn.js")
+      js_translate *%w[are_you_sure confirmation first_text prev_text next_text last_text before_page_text after_page_text empty_msg refresh_text display_msg]
 
-        # Filters
-        if column_filters_available
-          res << ext_examples + "ux/gridfilters/menu/ListMenu.js"
-          res << ext_examples + "ux/gridfilters/menu/RangeMenu.js"
-          res << ext_examples + "ux/gridfilters/GridFilters.js"
+      # JavaScript includes
+      ex = Netzke::Core.ext_location.join("examples")
 
-          %w{Boolean Date List Numeric String}.unshift("").each do |f|
-            res << ext_examples + "ux/gridfilters/filter/#{f}Filter.js"
-          end
+      js_include(ex.join("ux/CheckColumn.js"))
 
-          # Fix
-          res << "#{File.dirname(__FILE__)}/grid_panel/javascripts/misc.js"
-        end
+      # Includes for column filters
+      if column_filters_available
+        [
+          "ux/gridfilters/menu/ListMenu.js",
+          "ux/gridfilters/menu/RangeMenu.js",
+          "ux/gridfilters/GridFilters.js"
+        ].each{ |path| js_include(ex.join(path)) }
 
-        # DD
-        if rows_reordering_available
-          res << "#{File.dirname(__FILE__)}/grid_panel/javascripts/rows-dd.js"
+        %w{Boolean Date List Numeric String}.unshift("").each do |f|
+          js_include(ex.join"ux/gridfilters/filter/#{f}Filter.js")
         end
-
-        res
       end
 
-      # Fields to be displayed in the "General" tab of the configuration panel
-      def self.property_fields
-        [
-          # {:name => :ext_config__title,               :attr_type => :string},
-          # {:name => :ext_config__header,              :attr_type => :boolean, :default => true},
-          # {:name => :ext_config__enable_context_menu, :attr_type => :boolean, :default => true},
-          # {:name => :ext_config__enable_pagination,   :attr_type => :boolean, :default => true},
-          # {:name => :ext_config__rows_per_page,       :attr_type => :integer},
-          # {:name => :ext_config__prohibit_create,     :attr_type => :boolean},
-          # {:name => :ext_config__prohibit_update,     :attr_type => :boolean},
-          # {:name => :ext_config__prohibit_delete,     :attr_type => :boolean},
-          # {:name => :ext_config__prohibit_read,       :attr_type => :boolean}
-        ]
+      # Includes for rows reordering
+      if rows_reordering_available
+        js_include(ex.join("#{File.dirname(__FILE__)}/grid_panel/javascripts/rows-dd.js"))
       end
 
-
-      # The result of this method (a hash) is converted to a JSON object and passed as the configuration parameter
-      # to the constructor of our JavaScript class. Override it when you want to pass any extra configuration
-      # to the JavaScript side.
       def js_config
         super.merge({
           :bbar => config.has_key?(:bbar) ? config[:bbar] : default_bbar,
           :context_menu => config.has_key?(:context_menu) ? config[:context_menu] : default_context_menu,
-          :columns => columns, # columns
+          :columns => columns(:with_meta => true), # columns
+          :columns_order => config[:persistence] && state[:columns_order] || initial_columns_order,
           :model => config[:model], # the model name
           :inline_data => (get_data if config[:load_inline_data]), # inline data (loaded along with the grid panel)
           :pri => data_class.primary_key # table primary key name
         })
       end
 
+      def get_association_values(record)
+        columns.select{ |c| c[:name].index("__") }.each.inject({}) do |r,c|
+          r.merge(c[:name] => record.value_for_attribute(c, true))
+        end
+      end
+
+      def get_default_association_values
+        columns.select{ |c| c[:name].index("__") && c[:default_value] }.each.inject({}) do |r,c|
+          assoc, assoc_method = assoc_and_assoc_method_for_column(c)
+          assoc_instance = assoc.klass.find(c[:default_value])
+          r.merge(c[:name] => assoc_instance.send(assoc_method))
+        end
+      end
+      memoize :get_default_association_values
+
       def default_bbar
         res = %w{ add edit apply del }.map(&:to_sym).map(&:action)
         res << "-" << :add_in_form.action << :edit_in_form.action if config[:enable_edit_in_form]
@@ -259,19 +233,23 @@ module Netzke
         }
       end
 
-      action :edit, {
-        :text => I18n.t('netzke.basepack.grid_panel.actions.edit'),
-        :tooltip => I18n.t('netzke.basepack.grid_panel.actions.edit'),
-        :disabled => true,
-        :icon => :table_edit
-      }
+      action :edit do
+        {
+          :text => I18n.t('netzke.basepack.grid_panel.actions.edit'),
+          :tooltip => I18n.t('netzke.basepack.grid_panel.actions.edit'),
+          :disabled => true,
+          :icon => :table_edit
+        }
+      end
 
-      action :del, {
-        :text => I18n.t('netzke.basepack.grid_panel.actions.del'),
-        :tooltip => I18n.t('netzke.basepack.grid_panel.actions.del'),
-        :disabled => true,
-        :icon => :table_row_delete
-      }
+      action :del do
+        {
+          :text => I18n.t('netzke.basepack.grid_panel.actions.del'),
+          :tooltip => I18n.t('netzke.basepack.grid_panel.actions.del'),
+          :disabled => true,
+          :icon => :table_row_delete
+        }
+      end
 
       action :apply do
         {
@@ -282,25 +260,31 @@ module Netzke
         }
       end
 
-      action :add_in_form, {
-        :text => I18n.t('netzke.basepack.grid_panel.actions.add_in_form'),
-        :tooltip => I18n.t('netzke.basepack.grid_panel.actions.add_in_form'),
-        :icon => :application_form_add
-      }
+      action :add_in_form do
+        {
+          :text => I18n.t('netzke.basepack.grid_panel.actions.add_in_form'),
+          :tooltip => I18n.t('netzke.basepack.grid_panel.actions.add_in_form'),
+          :icon => :application_form_add
+        }
+      end
 
-      action :edit_in_form, {
-        :text => I18n.t('netzke.basepack.grid_panel.actions.edit_in_form'),
-        :tooltip => I18n.t('netzke.basepack.grid_panel.actions.edit_in_form'),
-        :disabled => true,
-        :icon => :application_form_edit
-      }
+      action :edit_in_form do
+        {
+          :text => I18n.t('netzke.basepack.grid_panel.actions.edit_in_form'),
+          :tooltip => I18n.t('netzke.basepack.grid_panel.actions.edit_in_form'),
+          :disabled => true,
+          :icon => :application_form_edit
+        }
+      end
 
-      action :search, {
-        :text => I18n.t('netzke.basepack.grid_panel.actions.search'),
-        :tooltip => I18n.t('netzke.basepack.grid_panel.actions.search'),
-        :enable_toggle => true,
-        :icon => :find
-      }
+      action :search do
+        {
+          :text => I18n.t('netzke.basepack.grid_panel.actions.search'),
+          :tooltip => I18n.t('netzke.basepack.grid_panel.actions.search'),
+          :enable_toggle => true,
+          :icon => :find
+        }
+      end
 
       component :add_form do
         {
@@ -311,14 +295,14 @@ module Netzke
           :items => [{
             :class_name => "Netzke::Basepack::FormPanel",
             :model => config[:model],
-            :items => default_fields_for_forms_with_default_values,
+            :items => default_fields_for_forms,
             :persistent_config => config[:persistent_config],
             :strong_default_attrs => config[:strong_default_attrs],
             :border => true,
             :bbar => false,
             :header => false,
             :mode => config[:mode],
-            :record => data_class.new
+            :record => data_class.new(columns_default_values)
           }.deep_merge(config[:add_form_config] || {})]
         }.deep_merge(config[:add_form_window_config] || {})
       end
@@ -337,7 +321,7 @@ module Netzke
             :bbar => false,
             :header => false,
             :mode => config[:mode]
-            # :record_id gets assigned by deliver_component at the moment of loading
+            # :record_id gets assigned by deliver_component dynamically, at the moment of loading
           }.deep_merge(config[:edit_form_config] || {})]
         }.deep_merge(config[:edit_form_window_config] || {})
       end
@@ -363,26 +347,12 @@ module Netzke
       component :search_form do
         {
           :lazy_loading => true,
-          :class_name => "Netzke::Basepack::GridPanel::SearchWindow",
+          :class_name => "Netzke::Basepack::SearchWindow",
           :model => config[:model],
           :fields => default_fields_for_forms
         }
       end
 
-
-      # def search_panel
-      #   {
-      #     :class_name => "Netzke::Basepack::FormPanel",
-      #     :model => "User",
-      #     # :items => default_fields_for_forms,
-      #     # :search_class_name => cronfig[:model],
-      #     # :persistent_config => config[:persistent_config],
-      #     :header => false,
-      #     :bbar => false,
-      #     # :mode => config[:mode]
-      #   }
-      # end
-
       # include ::Netzke::Plugins::ConfigurationTool if config_tool_available # it will load ConfigurationPanel into a modal window
 
     end