netzke-basepack 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.3.1
+Added the "conditions" configuration option to GridPanel to limit the search
+Basic column editor for grids has been replaced with FieldsConfigurator, which can do a bit more
+Added Checkbox column/form-field type for boolean fields
+"renderer" configuration option added for grid columns - any Ext.util.Format renderer can be specified there (thanks to Josh Holt for the initial idea)
+
 v0.3.0
 Added BasicApp widget - the base for a Ext.Viewport based ("application") widget with support for dynamic widget loading, browser history, authentification, and more. See the demo an http://netzke-demo.writelesscode.com
 

data/Manifest

@@ -9,6 +9,7 @@ generators/netzke_grid_panel/templates/create_netzke_grid_panel_columns.rb
 init.rb
 install.rb
 javascripts/basepack.js
+javascripts/check_column.js
 javascripts/filters.js
 lib/app/models/netzke_form_panel_field.rb
 lib/app/models/netzke_grid_panel_column.rb
@@ -18,6 +19,7 @@ lib/netzke/basic_app.rb
 lib/netzke/border_layout_panel.rb
 lib/netzke/column.rb
 lib/netzke/container.rb
+lib/netzke/fields_configurator.rb
 lib/netzke/form_panel.rb
 lib/netzke/grid_panel.rb
 lib/netzke/grid_panel_interface.rb

data/Rakefile

@@ -5,7 +5,7 @@ Echoe.new("netzke-basepack") do |p|
   p.email = "sergei@writelesscode.com"
   p.summary = "Base Netzke widgets - grid, form, tree, and more"
   p.url = "http://writelesscode.com"
-  p.runtime_dependencies = ["searchlogic >=1.6.2", "netzke-core >= 0.2.3"]
+  p.runtime_dependencies = ["searchlogic >=1.6.2", "netzke-core >= 0.2.4"]
   p.development_dependencies = []
   p.test_pattern = 'test/**/*_test.rb'
 

data/generators/netzke_grid_panel/templates/create_netzke_grid_panel_columns.rb

@@ -8,6 +8,7 @@ class CreateNetzkeGridPanelColumns < ActiveRecord::Migration
       t.boolean   :hidden
       t.integer   :width
       t.string    :editor, :limit => 32
+      t.string    :renderer, :limit => 32
 
       t.integer   :layout_id
       

data/javascripts/basepack.js

@@ -1,82 +1,110 @@
 // Editors for grid cells and form fields
 Ext.netzke.editors = {
-	combo_box: function(c, config){
-		var row = Ext.data.Record.create([{name:'id'}])
+  combo_box: function(c, config){
+    var row = Ext.data.Record.create([{name:'id'}])
     var store = new Ext.data.Store({
-      proxy: new Ext.data.HttpProxy({url:config.interface.getCbChoices, jsonData:{column:c.name}}),
-      reader: new Ext.data.ArrayReader({root:'data', id:0}, row)
+      proxy         : new Ext.data.HttpProxy({url:config.interface.getCbChoices, jsonData:{column:c.name}}),
+      reader        : new Ext.data.ArrayReader({root:'data', id:0}, row)
     })
-    return new Ext.form.ComboBox({
-      mode: 'remote',
-      displayField:'id',
-			valueField:'id',
-			triggerAction:'all',
-      store: store
+    
+    var comboBox = new Ext.form.ComboBox({
+      mode          : 'remote',
+      displayField  : 'id',
+      valueField    : 'id',
+      triggerAction : 'all',
+      typeAhead     : true,
+      selectOnFocus : true,
+      store         : store
     })
-	},
+    
+    // let user enter values that are not in the store
+    comboBox.on('blur', function(cb){
+      cb.setValue(cb.getRawValue());
+    });
+    comboBox.on('specialkey', function(cb, event){
+      if (event.getKey() == 9 || event.getKey() == 13) {cb.setValue(cb.getRawValue());}
+    });
+    
+    return comboBox;
+  },
 
-	text_field: function(c, config){
-		return new Ext.form.TextField({
-			selectOnFocus:true
-		})
-	},
-	
-	checkbox: function(c, config){
-		return new Ext.form.TextField({
-			selectOnFocus:true
-		})
-	},
-	
-	number_field: function(c, config){
-		return new Ext.form.NumberField({
-			selectOnFocus:true
-		})
-	},
-	
-	// TODO: it's simply a text field for now
-	datetime: function(c, config){
-		return new Ext.form.TextField({
-			selectOnFocus:true
-		})
-	}
+  text_field: function(c, config){
+    return new Ext.form.TextField({
+      selectOnFocus:true
+    })
+  },
+  
+  checkbox: function(c, config){
+    return new Ext.form.TextField({
+      selectOnFocus:true
+    })
+  },
+  
+  number_field: function(c, config){
+    return new Ext.form.NumberField({
+      selectOnFocus:true
+    })
+  },
+  
+  // TODO: it's simply a text field for now
+  datetime: function(c, config){
+    return new Ext.form.TextField({
+      selectOnFocus:true
+    })
+  }
 };
 
+Ext.netzke.renderer = function(renderer, c, config){
+  res = Ext.emptyFn;
+  switch (renderer) {
+
+    // custom renderers can be later added like this:
+    case 'my_renderer':
+      res = function(value){ return "Not implemented" };
+    break
+
+    // falls back to Ext.util.Format renderers
+    default:
+      res = Ext.util.Format[renderer]
+    break
+  }
+  return res
+}
+
 // Mapping of editor field to grid filters
 Ext.netzke.filterMap = {
-	number_field:'Numeric',
-	text_field:'String',
-	datetime:'String',
-	checkbox:'Boolean',
-	combo_box:'String',
-	date:'Date'
+  number_field:'Numeric',
+  text_field:'String',
+  datetime:'String',
+  checkbox:'Boolean',
+  combo_box:'String',
+  date:'Date'
 }
 
 Ext.data.RecordArrayReader = Ext.extend(Ext.data.JsonReader, {
-    /**
-     * Create a data block containing Ext.data.Records from an Array.
-     * @param {Object} o An Array of row objects which represents the dataset.
-     * @return {Object} data A data block which is used by an Ext.data.Store object as
-     * a cache of Ext.data.Records.
-     */
-    readRecord : function(o){
-      var sid = this.meta ? this.meta.id : null;
-    	var recordType = this.recordType, fields = recordType.prototype.fields;
-    	var records = [];
-    	var root = o;
-	    // for(var i = 0; i < root.length; i++){
-		    var n = root;
-	        var values = {};
-	        var id = ((sid || sid === 0) && n[sid] !== undefined && n[sid] !== "" ? n[sid] : null);
-	        for(var j = 0, jlen = fields.length; j < jlen; j++){
-                var f = fields.items[j];
-                var k = f.mapping !== undefined && f.mapping !== null ? f.mapping : j;
-                var v = n[k] !== undefined ? n[k] : f.defaultValue;
-                v = f.convert(v, n);
-                values[f.name] = v;
-            }
-	        var record = new recordType(values, id);
-	        record.json = n;
-	    // }
-	    return record;
+  /**
+   * Create a data block containing Ext.data.Records from an Array.
+   * @param {Object} o An Array of row objects which represents the dataset.
+   * @return {Object} data A data block which is used by an Ext.data.Store object as
+   * a cache of Ext.data.Records.
+   */
+  readRecord : function(o){
+    var sid = this.meta ? this.meta.id : null;
+    var recordType = this.recordType, fields = recordType.prototype.fields;
+    var records = [];
+    var root = o;
+    var n = root;
+    var values = {};
+    var id = ((sid || sid === 0) && n[sid] !== undefined && n[sid] !== "" ? n[sid] : null);
+    for(var j = 0, jlen = fields.length; j < jlen; j++){
+      var f = fields.items[j];
+      var k = f.mapping !== undefined && f.mapping !== null ? f.mapping : j;
+      var v = n[k] !== undefined ? n[k] : f.defaultValue;
+      v = f.convert(v, n);
+      values[f.name] = v;
     }
+    var record = new recordType(values, id);
+    record.json = n;
+    return record;
+  }
 });

data/javascripts/check_column.js

@@ -0,0 +1,33 @@
+// CheckColumn
+Ext.grid.CheckColumn = function(config){
+    Ext.apply(this, config);
+    if(!this.id){
+        this.id = Ext.id();
+    }
+    this.renderer = this.renderer.createDelegate(this);
+};
+
+Ext.grid.CheckColumn.prototype ={
+    init : function(grid){
+        this.grid = grid;
+		if (this.disabled) return; // SK
+        this.grid.on('render', function(){
+            var view = this.grid.getView();
+            view.mainBody.on('mousedown', this.onMouseDown, this);
+        }, this);
+    },
+
+    onMouseDown : function(e, t){
+        if(t.className && t.className.indexOf('x-grid3-cc-'+this.id) != -1){
+            e.stopEvent();
+            var index = this.grid.getView().findRowIndex(t);
+            var record = this.grid.store.getAt(index);
+            record.set(this.dataIndex, !record.data[this.dataIndex]);
+        }
+    },
+
+    renderer : function(v, p, record){
+        p.css += ' x-grid3-check-col-td'; 
+        return '<div class="x-grid3-check-col'+(v?'-on':'')+' x-grid3-cc-'+this.id+'">&#160;</div>';
+    }
+};

data/lib/netzke-basepack.rb

@@ -18,6 +18,7 @@ end
 
 # Include the javascript
 Netzke::Base.config[:javascripts] << "#{File.dirname(__FILE__)}/../javascripts/basepack.js"
+Netzke::Base.config[:javascripts] << "#{File.dirname(__FILE__)}/../javascripts/check_column.js"
 
 # TODO: implement configurable loading of JS, to spare the traffic at the initial loading
 extjs_dir = "#{RAILS_ROOT}/public/extjs"

data/lib/netzke/ar_ext.rb

@@ -160,6 +160,8 @@ module Netzke
           assoc_method = %w{name title label}.detect{|m| (assoc.klass.instance_methods + assoc.klass.column_names).include?(m) } || assoc.klass.primary_key
           res[:name] = "#{assoc.name}__#{assoc_method}"
         end
+
+        res[:width] = 50 if res[:editor] == :checkbox # more narrow column for checkboxes
         
         # merge with the given confg, which has the priority
         config.delete(:name) # because we might have changed the name

data/lib/netzke/border_layout_panel.rb

@@ -50,7 +50,7 @@ module Netzke
                   });
                   panel.oldSize.width = w;
                 }
-            		return true;
+                return true;
               }, this);
               else if (item.region == 'south' || item.region == 'north') item.on('resize', function(panel, w, h){
                 if (panel.oldSize.height != h) {
@@ -60,7 +60,7 @@ module Netzke
                   });
                   panel.oldSize.height = h;
                 }
-            		return true;
+                return true;
               }, this);
             }, this);
             this.un('afterlayout', this.setResizeEvents, this); // to avoid redefinition of resize events

data/lib/netzke/column.rb

@@ -6,10 +6,8 @@ module Netzke
 
       # layout = NetzkeLayout.create(:widget_name => widget.id_name, :items_class => self.name, :user_id => NetzkeLayout.user_id)
 
-      data_class = widget.config[:data_class_name].constantize
-
-      exposed_columns = normalize_columns(data_class.exposed_columns) # columns exposed from the data class
-
+      data_class          = widget.config[:data_class_name].constantize
+      exposed_columns     = normalize_columns(data_class.exposed_columns) # columns exposed from the data class
       columns_from_config = widget.config[:columns] && normalize_columns(widget.config[:columns]) # columns specified in widget's config
 
       if columns_from_config

data/lib/netzke/container.rb

@@ -46,16 +46,16 @@ module Netzke
     def self.js_items
       items.inject([]) do |a,i|
         a << {
-          :title => i.to_s.humanize,
-          :layout => 'fit',
-          :id => i.to_s,
-          # :id => "#{config[:name]}_#{i.to_s}",
-          :items => ([i.to_s.to_js.l] if !aggregatees[i][:late_aggregation]),
+          :title      => i.to_s.humanize,
+          :layout     => 'fit',
+          :id         => i.to_s,
+          # :id       => "#{config[:name]}_#{i.to_s}",
+          :items      => ([i.to_s.to_js.l] if !aggregatees[i][:late_aggregation]),
           # these listeners will be different for tab_panel and accordion
-          :collapsed => !aggregatees[i][:active],
-          :listeners => {
-            # :activate => {:fn => "function(p){this.feedback(p.id)}".l, :scope => this},
-            :expand => {:fn => "this.loadItemWidget".l, :scope => this}
+          :collapsed  => !aggregatees[i][:active],
+          :listeners  => {
+          # :activate => {:fn => "function(p){this.feedback(p.id)}".l, :scope => this},
+          :expand     => {:fn => "this.loadItemWidget".l, :scope => this}
           }
         }
       end

data/lib/netzke/fields_configurator.rb

@@ -0,0 +1,66 @@
+module Netzke
+  class FieldsConfigurator < GridPanel
+    interface :load_defaults
+    
+    def initialize(*args)
+      super
+
+      # process config[:layout]
+      config[:conditions] = {:layout_id => (config[:layout] && config[:layout].id)}
+      config[:columns] = [
+        :id, 
+        :label, 
+        {:name => :read_only, :label => "R/O"}, 
+        :hidden, 
+        {:name => :width, :width => 50}, 
+        {:name => :editor, :editor => :combo_box},
+        {:name => :renderer, :editor => :combo_box}
+      ]
+      
+    end
+
+    def initial_config
+      super.recursive_merge({
+        :name              => 'columns',
+        :widget_class_name => "GridPanel",
+        :data_class_name   => "NetzkeGridPanelColumn",
+        :ext_config        => {:title => false},
+        # :conditions        => {:layout_id => config[:layout].id},
+        :active            => true
+      })
+    end
+    
+    def actions
+      super + [{
+        :text => 'Restore defaults', :handler => 'loadDefaults'
+      }]
+    end
+    
+    def self.js_extend_properties
+      super.merge({
+        :load_defaults => <<-JS.l,
+          function(){
+            Ext.Msg.confirm('Confirm', 'Are you sure?', function(btn){
+              if (btn == 'yes') {
+                Ext.Ajax.request({
+                  url:this.initialConfig.interface.loadDefaults,
+                  callback:function(){
+                    this.store.reload();
+                  },
+                  scope:this
+                })
+              }
+            }, this);
+          }
+        JS
+      })
+    end
+    
+    def load_defaults(params)
+      NetzkeLayout.destroy(config[:layout].id)
+      NetzkeGridPanelColumn.create_layout_for_widget(parent.parent)
+      {}
+    end
+    
+  end
+end

data/lib/netzke/form_panel.rb

@@ -21,14 +21,14 @@ module Netzke
       
       def js_default_config
         super.merge({
-          :auto_scroll => true,
-          :bbar => "config.actions".l,
-          # :plugins => "plugins".l,
-          :items => "fields".l,
-          :default_type => 'textfield',
-          :body_style => 'padding:5px 5px 0',
-          :label_width => 150,
-          :listeners => {:afterlayout => {:fn => "this.afterlayoutHandler".l, :scope => this}},
+          :auto_scroll    => true,
+          :bbar           => "config.actions".l,
+          # :plugins      => "plugins".l,
+          :items          => "fields".l,
+          :default_type   => 'textfield',
+          :body_style     => 'padding:5px 5px 0',
+          :label_width    => 150,
+          :listeners      => {:afterlayout => {:fn => "this.afterlayoutHandler".l, :scope => this}},
 
           #custom configs
           :auto_load_data => true,
@@ -152,12 +152,9 @@ module Netzke
       logger.debug { "!!! params: #{params.inspect}" }
       klass = config[:data_class_name].constantize
       case params[:neighbour]
-      when "previous"
-        book = klass.previous(params[:id])
-      when "next"
-        book = klass.next(params[:id])
-      else
-        book = klass.find(params[:id])
+      when "previous" then book = klass.previous(params[:id])
+      when "next"     then book = klass.next(params[:id])
+      else                 book = klass.find(params[:id])
       end
       [book && book.to_array(get_fields)].to_json
     end

data/lib/netzke/grid_panel.rb

@@ -47,45 +47,38 @@ module Netzke
     def initial_config
       {
         :ext_config => {
-          :config_tool => false, 
-          :enable_column_filters => Netzke::Base.config[:grid_panel][:filters], 
-          :enable_column_move => true, 
-          :enable_column_resize => true,
-          :border => true,
-          :load_mask => true
+          :config_tool           => false,
+          :enable_column_filters => Netzke::Base.config[:grid_panel][:filters],
+          :enable_column_move    => true,
+          :enable_column_resize  => true,
+          :border                => true,
+          :load_mask             => true
         },
         :persistent_layout => true,
         :persistent_config => true
       }
     end
 
+    def initial_dependencies
+      ["FieldsConfigurator"] # TODO: make this happen automatically
+    end
+
     def property_widgets
       [{
-        :name => 'columns',
-        :widget_class_name => "GridPanel", 
-        :data_class_name => column_manager_class.name, 
-        :ext_config => {:title => false, :config_tool => false},
-        :active => true
+        :name              => 'columns',
+        :widget_class_name => "FieldsConfigurator",
+        :ext_config        => {:title => false},
+        :active            => true,
+        :layout            => NetzkeLayout.by_widget(id_name)
       },{
-        :name => 'general',
-        :widget_class_name => "PreferenceGrid", 
-        :host_widget_name => @id_name, 
+        :name               => 'general',
+        :widget_class_name  => "PreferenceGrid",
+        :host_widget_name   => id_name,
         :default_properties => available_permissions.map{ |k| {:name => "permissions.#{k}", :value => @permissions[k.to_sym]}},
-        :ext_config => {:title => false}
+        :ext_config         => {:title => false}
       }]
     end
 
-    ## Data for properties grid
-    def properties__columns__get_data(params = {})
-      # add extra filter to show only the columns for the current grid (filtered by layout_id)
-      layout_id = layout_manager_class.by_widget(id_name).id
-      params[:filter] ||= {}
-      params[:filter].merge!(:extra_conditions => {:field => 'layout_id', :data => {:type => 'numeric', :value => layout_id}})
-      
-      columns_widget = aggregatee_instance(:properties__columns)
-      columns_widget.interface_get_data(params)
-    end
-    
     def properties__general__load_source(params = {})
       w = aggregatee_instance(:properties__general)
       w.interface_load_source(params)
@@ -134,7 +127,6 @@ module Netzke
     #   [{:text => "config.dataClassName".l, :menu => "config.actions".l}]
     # end
     
-    # include ColumnOperations
     include PropertiesTool # it will load aggregation with name :properties into a modal window
   end
 end

data/lib/netzke/grid_panel_interface.rb

@@ -100,7 +100,9 @@ module Netzke::GridPanelInterface
   
   # get records
   def get_records(params)
-    search_params = normalize_params(params)
+    search_params = normalize_params(params)  # make params coming from the browser understandable by searchlogic
+    search_params[:conditions].recursive_merge!(config[:conditions] || {})  # merge with conditions coming from the config
+    
     raise ArgumentError, "No data_class_name specified for widget '#{config[:name]}'" if !config[:data_class_name]
     records = config[:data_class_name].constantize.all(search_params.clone) # clone needed as searchlogic removes :conditions key from the hash
     # output_array = []

data/lib/netzke/grid_panel_js_builder.rb

@@ -29,25 +29,25 @@ module Netzke::GridPanelJsBuilder
 
     def js_default_config
       super.merge({
-        :store => "ds".l,
-        :cm => "cm".l,
-        :sel_model => "new Ext.grid.RowSelectionModel()".l,
-        :auto_scroll => true,
-        :click_to_edit => 2,
+        :store            => "ds".l,
+        :cm               => "cm".l,
+        :sel_model        => "new Ext.grid.RowSelectionModel()".l,
+        :auto_scroll      => true,
+        :click_to_edit    => 2,
         :track_mouse_over => true,
-        # :bbar => "config.actions".l,
-        :bbar => js_bbar,
-        :plugins => "plugins".l,
+        # :bbar           => "config.actions".l,
+        :bbar             => js_bbar,
+        :plugins          => "plugins".l,
       
         #custom configs
-        :auto_load_data => true
+        :auto_load_data   => true
       })
     end
   
     def js_before_constructor
       <<-JS
       var plugins = [];
-    	if (!config.columns) this.feedback('No columns defined for grid '+config.id);
+      if (!config.columns) this.feedback('No columns defined for grid '+config.id);
       this.recordConfig = [];
       Ext.each(config.columns, function(column){this.recordConfig.push({name:column.name})}, this);
       this.Row = Ext.data.Record.create(this.recordConfig);
@@ -65,15 +65,31 @@ module Netzke::GridPanelJsBuilder
       this.cmConfig = [];
       Ext.each(config.columns, function(c){
         var editor = (c.readOnly || !config.permissions.update) ? null : Ext.netzke.editors[c.editor](c, config);
+        var renderer = Ext.netzke.renderer(c.renderer);
+        
+        if (c.editor == 'checkbox') {
+          var plugin = new Ext.grid.CheckColumn({
+      			header:     c.label || c.name,
+      			dataIndex:  c.name,
+      			disabled:   c.readOnly,
+      			hidden:     c.hidden,
+      			width:      c.width
+          });
+          plugins.push(plugin);
+          this.cmConfig.push(plugin);
+          
+        } else {
+          this.cmConfig.push({
+            header: c.label || c.name,
+            dataIndex: c.name,
+            hidden: c.hidden,
+            width: c.width,
+            editor: editor,
+            renderer: renderer,
+            sortable: true
+          })
+        }
 
-        this.cmConfig.push({
-          header: c.label || c.name,
-          dataIndex: c.name,
-          hidden: c.hidden,
-          width: c.width,
-          editor: editor,
-          sortable: true
-        })
       }, this);
 
       var cm = new Ext.grid.ColumnModel(this.cmConfig);
@@ -86,7 +102,7 @@ module Netzke::GridPanelJsBuilder
         Ext.each(config.columns, function(c){
           filters.push({type:Ext.netzke.filterMap[c.editor], dataIndex:c.name})
         })
-      	var gridFilters = new Ext.grid.GridFilters({filters:filters});
+        var gridFilters = new Ext.grid.GridFilters({filters:filters});
         plugins.push(gridFilters);
       }
     
@@ -96,7 +112,7 @@ module Netzke::GridPanelJsBuilder
     def js_listeners
       super.merge({
         :columnresize => {:fn => "this.onColumnResize".l, :scope => this},
-        :columnmove => {:fn => "this.onColumnMove".l, :scope => this}
+        :columnmove   => {:fn => "this.onColumnMove".l, :scope => this}
       })
     end
   
@@ -136,12 +152,12 @@ module Netzke::GridPanelJsBuilder
             var r = new this.Row(rowConfig); // TODO: add default values
             r.set('id', -r.id); // to distinguish new records by negative values
             this.stopEditing();
-        		this.store.add(r);
-        		this.store.newRecords = this.store.newRecords || []
-        		this.store.newRecords.push(r);
+            this.store.add(r);
+            this.store.newRecords = this.store.newRecords || []
+            this.store.newRecords.push(r);
             // console.info(this.store.newRecords);
             this.tryStartEditing(this.store.indexOf(r));
-        	}
+          }
         JS
     
         :edit => <<-JS.l,
@@ -155,17 +171,17 @@ module Netzke::GridPanelJsBuilder
     
         # try editing the first editable (not hidden, not read-only) sell
         :try_start_editing => <<-JS.l,
-        	function(row){
-        	  if (row == null) return;
-        		var editableColumns = this.getColumnModel().getColumnsBy(function(columnConfig, index){
-        			return !columnConfig.hidden && !!columnConfig.editor;
-        		});
-        		// console.info(editableColumns);
-        		var firstEditableColumn = editableColumns[0];
-        		if (firstEditableColumn){
-        			this.startEditing(row, firstEditableColumn.id);
-        		}
-        	}
+          function(row){
+            if (row == null) return;
+            var editableColumns = this.getColumnModel().getColumnsBy(function(columnConfig, index){
+              return !columnConfig.hidden && !!columnConfig.editor;
+            });
+            // console.info(editableColumns);
+            var firstEditableColumn = editableColumns[0];
+            if (firstEditableColumn){
+              this.startEditing(row, firstEditableColumn.id);
+            }
+          }
         JS
 
         :delete => <<-JS.l,
@@ -175,19 +191,19 @@ module Netzke::GridPanelJsBuilder
                 if (btn == 'yes') {
                   var records = []
                   this.getSelectionModel().each(function(r){
-            		    records.push(r.get('id'));
+                    records.push(r.get('id'));
                   }, this);
-          		    Ext.Ajax.request({
-              			url: this.initialConfig.interface.deleteData,
-              			params: {records: Ext.encode(records)},
-              			success:function(r){ 
-              				var m = Ext.decode(r.responseText);
-              				this.store.reload();
+                  Ext.Ajax.request({
+                    url: this.initialConfig.interface.deleteData,
+                    params: {records: Ext.encode(records)},
+                    success:function(r){ 
+                      var m = Ext.decode(r.responseText);
+                      this.store.reload();
                       // this.loadWithFeedback();
-              				this.feedback(m.flash);
-              			},
-              			scope:this
-              		});
+                      this.feedback(m.flash);
+                    },
+                    scope:this
+                  });
                 }
               }, this);
             }
@@ -198,46 +214,46 @@ module Netzke::GridPanelJsBuilder
 
             var newRecords = [];
             if (this.store.newRecords){
-          		Ext.each(this.store.newRecords, function(r){
-          		  newRecords.push(r.getChanges())
-          		  r.commit() // commit the changes, so that they are not picked up by getModifiedRecords() further down
-          		}, this);
-          		delete this.store.newRecords;
-          	}
-      		
-          	var updatedRecords = [];
-        		Ext.each(this.store.getModifiedRecords(),
-        			function(record) {
-        				var completeRecordData = {};
-        				Ext.apply(completeRecordData, Ext.apply(record.getChanges(), {id:record.get('id')}));
-        				updatedRecords.push(completeRecordData);
-        			}, 
-        		this);
+              Ext.each(this.store.newRecords, function(r){
+                newRecords.push(r.getChanges())
+                r.commit() // commit the changes, so that they are not picked up by getModifiedRecords() further down
+              }, this);
+              delete this.store.newRecords;
+            }
+          
+            var updatedRecords = [];
+            Ext.each(this.store.getModifiedRecords(),
+              function(record) {
+                var completeRecordData = {};
+                Ext.apply(completeRecordData, Ext.apply(record.getChanges(), {id:record.get('id')}));
+                updatedRecords.push(completeRecordData);
+              }, 
+            this);
           
             if (newRecords.length > 0 || updatedRecords.length > 0) {
-          		Ext.Ajax.request({
-          			url:this.initialConfig.interface.postData,
-          			params: {
-          			  updated_records: Ext.encode(updatedRecords), 
-          			  created_records: Ext.encode(newRecords),
-          			  filters: this.store.baseParams.filters
-          			},
-          			success:function(response){
-          				var m = Ext.decode(response.responseText);
-          				if (m.success) {
-          					this.store.reload();
+              Ext.Ajax.request({
+                url:this.initialConfig.interface.postData,
+                params: {
+                  updated_records: Ext.encode(updatedRecords), 
+                  created_records: Ext.encode(newRecords),
+                  filters: this.store.baseParams.filters
+                },
+                success:function(response){
+                  var m = Ext.decode(response.responseText);
+                  if (m.success) {
+                    this.store.reload();
                     // this.loadWithFeedback();
-          					this.store.commitChanges();
-          					this.feedback(m.flash);
-          				} else {
-          					this.feedback(m.flash);
-          				}
-          			},
-          			failure:function(response){
-          				this.feedback('Bad response from server');
-          			},
-          			scope:this
-          		});
+                    this.store.commitChanges();
+                    this.feedback(m.flash);
+                  } else {
+                    this.feedback(m.flash);
+                  }
+                },
+                failure:function(response){
+                  this.feedback('Bad response from server');
+                },
+                scope:this
+              });
             }
           
           }

data/lib/netzke/properties_tool.rb

@@ -28,31 +28,31 @@ module Netzke
               var w = new Ext.Window({
                 title:'Config',
                 layout:'fit',
-        				modal:true,
+                modal:true,
                 width:window.innerWidth*.9,
                 height:window.innerHeight*.9,
-        	      closeAction:'destroy',
-        	      buttons:[{
-        	        text:'Submit',
-        	        handler:function(){this.ownerCt.closeRes = 'OK'; this.ownerCt.destroy()}
-        	      }]
+                closeAction:'destroy',
+                buttons:[{
+                  text:'Submit',
+                  handler:function(){this.ownerCt.closeRes = 'OK'; this.ownerCt.destroy()}
+                }]
 
-        			});
+              });
 
-        			w.show(null, function(){
+              w.show(null, function(){
                 w.loadWidget(this.initialConfig.id+"__properties__get_widget");
-        			}, this);
+              }, this);
 
-        			w.on('destroy', function(){
-        			  if (w.closeRes == 'OK'){
+              w.on('destroy', function(){
+                if (w.closeRes == 'OK'){
                   widget = this;
-        			    if (widget.ownerCt) {
+                  if (widget.ownerCt) {
                     widget.ownerCt.loadWidget(widget.initialConfig.interface.getWidget);
                   } else {
                     this.feedback('Reload current window') // no aggregation
                   }
-        			  }
-        			}, this)
+                }
+              }, this)
             }
           JS
         })

data/lib/netzke/property_grid.rb

@@ -47,7 +47,7 @@ module Netzke
             url:this.initialConfig.interface.loadSource,
             success:function(r){
               var m = Ext.decode(r.responseText);
-      				this.setSource(m.source);
+              this.setSource(m.source);
               // this.feedback(m.flash);
             },
             scope:this

data/lib/netzke/wrapper.rb

@@ -4,9 +4,9 @@ module Netzke
       # make us an invisible 'fit'-layout panel
       super.merge({
         :layout => 'fit',
-        :title => false,
+        :title  => false,
         :border => false,
-        :items => ["new Ext.componentCache[config.itemConfig.widgetClassName](config.itemConfig)".l]
+        :items  => ["new Ext.componentCache[config.itemConfig.widgetClassName](config.itemConfig)".l]
       })
     end
 

data/netzke-basepack.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-basepack}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergei Kozlov"]
-  s.date = %q{2009-01-25}
+  s.date = %q{2009-01-28}
   s.description = %q{Base Netzke widgets - grid, form, tree, and more}
   s.email = %q{sergei@writelesscode.com}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/app/models/netzke_form_panel_field.rb", "lib/app/models/netzke_grid_panel_column.rb", "lib/netzke/accordion_panel.rb", "lib/netzke/ar_ext.rb", "lib/netzke/basic_app.rb", "lib/netzke/border_layout_panel.rb", "lib/netzke/column.rb", "lib/netzke/container.rb", "lib/netzke/form_panel.rb", "lib/netzke/grid_panel.rb", "lib/netzke/grid_panel_interface.rb", "lib/netzke/grid_panel_js_builder.rb", "lib/netzke/panel.rb", "lib/netzke/preference_grid.rb", "lib/netzke/properties_tool.rb", "lib/netzke/property_grid.rb", "lib/netzke/wrapper.rb", "lib/netzke-basepack.rb", "LICENSE", "README.rdoc", "tasks/netzke_basepack_tasks.rake"]
-  s.files = ["CHANGELOG", "css/basepack.css", "generators/netzke_basepack/netzke_basepack_generator.rb", "generators/netzke_basepack/USAGE", "generators/netzke_form_panel/netzke_form_panel_generator.rb", "generators/netzke_form_panel/templates/create_netzke_form_panel_fields.rb", "generators/netzke_grid_panel/netzke_grid_panel_generator.rb", "generators/netzke_grid_panel/templates/create_netzke_grid_panel_columns.rb", "init.rb", "install.rb", "javascripts/basepack.js", "javascripts/filters.js", "lib/app/models/netzke_form_panel_field.rb", "lib/app/models/netzke_grid_panel_column.rb", "lib/netzke/accordion_panel.rb", "lib/netzke/ar_ext.rb", "lib/netzke/basic_app.rb", "lib/netzke/border_layout_panel.rb", "lib/netzke/column.rb", "lib/netzke/container.rb", "lib/netzke/form_panel.rb", "lib/netzke/grid_panel.rb", "lib/netzke/grid_panel_interface.rb", "lib/netzke/grid_panel_js_builder.rb", "lib/netzke/panel.rb", "lib/netzke/preference_grid.rb", "lib/netzke/properties_tool.rb", "lib/netzke/property_grid.rb", "lib/netzke/wrapper.rb", "lib/netzke-basepack.rb", "LICENSE", "Manifest", "Rakefile", "README.rdoc", "tasks/netzke_basepack_tasks.rake", "test/app_root/app/controllers/application.rb", "test/app_root/app/models/book.rb", "test/app_root/app/models/category.rb", "test/app_root/app/models/city.rb", "test/app_root/app/models/continent.rb", "test/app_root/app/models/country.rb", "test/app_root/app/models/genre.rb", "test/app_root/config/boot.rb", "test/app_root/config/database.yml", "test/app_root/config/environment.rb", "test/app_root/config/environments/in_memory.rb", "test/app_root/config/environments/mysql.rb", "test/app_root/config/environments/postgresql.rb", "test/app_root/config/environments/sqlite.rb", "test/app_root/config/environments/sqlite3.rb", "test/app_root/config/routes.rb", "test/app_root/db/migrate/20081222033343_create_books.rb", "test/app_root/db/migrate/20081222033440_create_genres.rb", "test/app_root/db/migrate/20081222035855_create_netzke_preferences.rb", "test/app_root/db/migrate/20081223024935_create_categories.rb", "test/app_root/db/migrate/20081223025635_create_countries.rb", "test/app_root/db/migrate/20081223025653_create_continents.rb", "test/app_root/db/migrate/20081223025732_create_cities.rb", "test/app_root/db/migrate/20090102223630_create_netzke_layouts.rb", "test/app_root/db/migrate/20090102223811_create_netzke_grid_panel_columns.rb", "test/app_root/script/console", "test/app_root/vendor/plugins/acts_as_list/init.rb", "test/app_root/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb", "test/app_root/vendor/plugins/acts_as_list/README", "test/ar_ext_test.rb", "test/border_layout_panel_test.rb", "test/column_test.rb", "test/console_with_fixtures.rb", "test/fixtures/books.yml", "test/fixtures/categories.yml", "test/fixtures/cities.yml", "test/fixtures/continents.yml", "test/fixtures/countries.yml", "test/fixtures/genres.yml", "test/grid_panel_test.rb", "test/netzke_basepack_test.rb", "test/schema.rb", "test/test_helper.rb", "uninstall.rb", "netzke-basepack.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/app/models/netzke_form_panel_field.rb", "lib/app/models/netzke_grid_panel_column.rb", "lib/netzke/accordion_panel.rb", "lib/netzke/ar_ext.rb", "lib/netzke/basic_app.rb", "lib/netzke/border_layout_panel.rb", "lib/netzke/column.rb", "lib/netzke/container.rb", "lib/netzke/fields_configurator.rb", "lib/netzke/form_panel.rb", "lib/netzke/grid_panel.rb", "lib/netzke/grid_panel_interface.rb", "lib/netzke/grid_panel_js_builder.rb", "lib/netzke/panel.rb", "lib/netzke/preference_grid.rb", "lib/netzke/properties_tool.rb", "lib/netzke/property_grid.rb", "lib/netzke/wrapper.rb", "lib/netzke-basepack.rb", "LICENSE", "README.rdoc", "tasks/netzke_basepack_tasks.rake"]
+  s.files = ["CHANGELOG", "css/basepack.css", "generators/netzke_basepack/netzke_basepack_generator.rb", "generators/netzke_basepack/USAGE", "generators/netzke_form_panel/netzke_form_panel_generator.rb", "generators/netzke_form_panel/templates/create_netzke_form_panel_fields.rb", "generators/netzke_grid_panel/netzke_grid_panel_generator.rb", "generators/netzke_grid_panel/templates/create_netzke_grid_panel_columns.rb", "init.rb", "install.rb", "javascripts/basepack.js", "javascripts/check_column.js", "javascripts/filters.js", "lib/app/models/netzke_form_panel_field.rb", "lib/app/models/netzke_grid_panel_column.rb", "lib/netzke/accordion_panel.rb", "lib/netzke/ar_ext.rb", "lib/netzke/basic_app.rb", "lib/netzke/border_layout_panel.rb", "lib/netzke/column.rb", "lib/netzke/container.rb", "lib/netzke/fields_configurator.rb", "lib/netzke/form_panel.rb", "lib/netzke/grid_panel.rb", "lib/netzke/grid_panel_interface.rb", "lib/netzke/grid_panel_js_builder.rb", "lib/netzke/panel.rb", "lib/netzke/preference_grid.rb", "lib/netzke/properties_tool.rb", "lib/netzke/property_grid.rb", "lib/netzke/wrapper.rb", "lib/netzke-basepack.rb", "LICENSE", "Manifest", "Rakefile", "README.rdoc", "tasks/netzke_basepack_tasks.rake", "test/app_root/app/controllers/application.rb", "test/app_root/app/models/book.rb", "test/app_root/app/models/category.rb", "test/app_root/app/models/city.rb", "test/app_root/app/models/continent.rb", "test/app_root/app/models/country.rb", "test/app_root/app/models/genre.rb", "test/app_root/config/boot.rb", "test/app_root/config/database.yml", "test/app_root/config/environment.rb", "test/app_root/config/environments/in_memory.rb", "test/app_root/config/environments/mysql.rb", "test/app_root/config/environments/postgresql.rb", "test/app_root/config/environments/sqlite.rb", "test/app_root/config/environments/sqlite3.rb", "test/app_root/config/routes.rb", "test/app_root/db/migrate/20081222033343_create_books.rb", "test/app_root/db/migrate/20081222033440_create_genres.rb", "test/app_root/db/migrate/20081222035855_create_netzke_preferences.rb", "test/app_root/db/migrate/20081223024935_create_categories.rb", "test/app_root/db/migrate/20081223025635_create_countries.rb", "test/app_root/db/migrate/20081223025653_create_continents.rb", "test/app_root/db/migrate/20081223025732_create_cities.rb", "test/app_root/db/migrate/20090102223630_create_netzke_layouts.rb", "test/app_root/db/migrate/20090102223811_create_netzke_grid_panel_columns.rb", "test/app_root/script/console", "test/app_root/vendor/plugins/acts_as_list/init.rb", "test/app_root/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb", "test/app_root/vendor/plugins/acts_as_list/README", "test/ar_ext_test.rb", "test/border_layout_panel_test.rb", "test/column_test.rb", "test/console_with_fixtures.rb", "test/fixtures/books.yml", "test/fixtures/categories.yml", "test/fixtures/cities.yml", "test/fixtures/continents.yml", "test/fixtures/countries.yml", "test/fixtures/genres.yml", "test/grid_panel_test.rb", "test/netzke_basepack_test.rb", "test/schema.rb", "test/test_helper.rb", "uninstall.rb", "netzke-basepack.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://writelesscode.com}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Netzke-basepack", "--main", "README.rdoc"]
@@ -26,13 +26,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<searchlogic>, [">= 1.6.2"])
-      s.add_runtime_dependency(%q<netzke-core>, [">= 0", "= 0.2.3"])
+      s.add_runtime_dependency(%q<netzke-core>, [">= 0", "= 0.2.4"])
     else
       s.add_dependency(%q<searchlogic>, [">= 1.6.2"])
-      s.add_dependency(%q<netzke-core>, [">= 0", "= 0.2.3"])
+      s.add_dependency(%q<netzke-core>, [">= 0", "= 0.2.4"])
     end
   else
     s.add_dependency(%q<searchlogic>, [">= 1.6.2"])
-    s.add_dependency(%q<netzke-core>, [">= 0", "= 0.2.3"])
+    s.add_dependency(%q<netzke-core>, [">= 0", "= 0.2.4"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-basepack
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-25 00:00:00 -06:00
+date: 2009-01-28 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
         version: "0"
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.3
+        version: 0.2.4
     version: 
 description: Base Netzke widgets - grid, form, tree, and more
 email: sergei@writelesscode.com
@@ -51,6 +51,7 @@ extra_rdoc_files:
 - lib/netzke/border_layout_panel.rb
 - lib/netzke/column.rb
 - lib/netzke/container.rb
+- lib/netzke/fields_configurator.rb
 - lib/netzke/form_panel.rb
 - lib/netzke/grid_panel.rb
 - lib/netzke/grid_panel_interface.rb
@@ -76,6 +77,7 @@ files:
 - init.rb
 - install.rb
 - javascripts/basepack.js
+- javascripts/check_column.js
 - javascripts/filters.js
 - lib/app/models/netzke_form_panel_field.rb
 - lib/app/models/netzke_grid_panel_column.rb
@@ -85,6 +87,7 @@ files:
 - lib/netzke/border_layout_panel.rb
 - lib/netzke/column.rb
 - lib/netzke/container.rb
+- lib/netzke/fields_configurator.rb
 - lib/netzke/form_panel.rb
 - lib/netzke/grid_panel.rb
 - lib/netzke/grid_panel_interface.rb