netzke-basepack 0.5.9 → 0.5.10

data/CHANGELOG.rdoc

@@ -1,4 +1,10 @@
-= v0.6.0 - EDGE
+= v0.5.10 - 2010-06-14
+* Impr: Checkbox replaced with tri-state checkbox in multi-edit form in GridPanel.
+* Impr: Column renderers reworked, allowing for more flexibility and cleanness.
+* Fix:  After applying changes to a grid disable "Edit in form" action.
+* Impr: A grid's forms are now getting the same fields as specified for the grid.
+
+= v0.5.9 - 2010-06-11
 * !!!: after updating to this version, run script/generate netzke_basepack
 * New: tri-state checkbox introduced into the search form
 * Impr: better defaults for the search form
@@ -9,12 +15,12 @@
 * Fix: FieldsConfigurator should now work on Heroku
 * Fix: GridPanel date filter now should work
 * New: GridPanel now has a method on_data_changed that can be overridden by children to detect actions that modify data
-* New: New way of Netzke virtual attributes in AR models.
-* New: Grid/FormPanel refactoring.
+* New: New way of configuring Netzke (virtual) attributes for AR models.
+* Impr: Grid/FormPanel refactoring.
 * Impr: Multi-level column/fields configuration reworked and made more consistent.
 * New: New configuration layer introduced between the AR models and the rest of Netzke widgets. Use AttributesConfigurator to access it.
 * New: FamFamFam Silk icons support.
-* Impr: Reworked Netzke (virtual) attributes for Grid/FormPanel
+* Impr: Reworked defining Netzke (virtual) attributes for Grid/FormPanel.
 
 = v0.5.8 - 2010-03-12
 * Fix: GertThiel's method_missing-related fix enabling better compatibility with other Ruby libs

data/Rakefile

@@ -1,7 +1,7 @@
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    gemspec.version = "0.5.9"
+    gemspec.version = "0.5.10"
     gemspec.name = "netzke-basepack"
     gemspec.summary = "Pre-built Rails + ExtJS widgets for your RIA"
     gemspec.description = "A set of full-featured extendible Netzke widgets (such as FormPanel, GridPanel, Window, BorderLayoutPanel, etc) which can be used as building block for your RIA"
@@ -9,23 +9,24 @@ begin
     gemspec.homepage = "http://github.com/skozlov/netzke-basepack"
     gemspec.rubyforge_project = "netzke-basepack"
     gemspec.authors = ["Sergei Kozlov"]
-    gemspec.add_dependency("netzke-core", ">=0.5.2")
+    gemspec.add_dependency("netzke-core", ">=0.5.3")
     gemspec.add_dependency("searchlogic", ">=2.0.0")
     gemspec.add_dependency("will_paginate", ">=2.0.0")
     gemspec.add_dependency("acts_as_list", ">=0.1.2")
     gemspec.post_install_message = <<-MESSAGE
 
-    ========================================================================
+========================================================================
 
-               Thanks for installing Netzke Basepack!
-               
-      Run "./script/generate netzke_basepack" to finish the installation.
+           Thanks for installing Netzke Basepack!
+           
+  Don't forget to run "./script/generate netzke_basepack" for each 
+  Rails app that will be using this gem.
 
-      Netzke home page:     http://netzke.org
-      Netzke Google Groups: http://groups.google.com/group/netzke
-      Netzke tutorials:     http://blog.writelesscode.com
+  Netzke home page:     http://netzke.org
+  Netzke Google Groups: http://groups.google.com/group/netzke
+  Netzke tutorials:     http://blog.writelesscode.com
 
-    ========================================================================
+========================================================================
 
     MESSAGE
     

data/javascripts/basepack.js

@@ -38,42 +38,6 @@ Ext.netzke.ComboBox = Ext.extend(Ext.form.ComboBox, {
 
 Ext.reg('combobox', Ext.netzke.ComboBox);
 
-/* 
-  Accepts a string which either contains:
-  Ext.util.Format method (e.g. 'usMoney'), 
-  or 
-  JSON-encoded array, where the first element is Ext.util.Format method (e.g. 'ellipsis'), 
-  and the rest of the elements - configuration parameters that should be passed to this method besids
-  the value to be rendered (e.g. '2');
-  
-  Example of the latter: ["defaultValue", "MyDefaultValue"]
-*/
-Ext.netzke.normalizedRenderer = function(config) {
-  res = null;
-  
-  if (config) {
-    try{
-      config = Ext.decode(config); // it's an array consisting of renderer's name *and* eventual options
-    } catch(e) {
-      // leave config as is - it's supposed to be the renderer's name
-    }
-
-    if (Ext.isArray(config)) {
-      res = function(v){
-        var formatMethod = config[0];
-        var valueAndOptions = config.slice(1);
-        valueAndOptions.unshift(v);
-        // call the Format function with the argument *and* configuration
-        return Ext.util.Format[formatMethod] ? Ext.util.Format[formatMethod].apply(this, valueAndOptions) : "Unknown renderer";
-      }
-    } else {
-      res = Ext.util.Format[config] ? Ext.util.Format[config] : function(v){return "Unknown renderer"}
-    }
-  }
-    
-  return res;
-};
-
 Ext.util.Format.mask = function(v){
   return "********";
 };

data/lib/netzke/grid_panel.rb

@@ -304,6 +304,7 @@ module Netzke
           :item => {
             :class_name => "FormPanel",
             :model => config[:model],
+            :fields => default_fields_for_forms,
             :persistent_config => config[:persistent_config],
             :strong_default_attrs => config[:strong_default_attrs],
             :ext_config => {
@@ -325,6 +326,7 @@ module Netzke
           :item => {
             :class_name => "FormPanel",
             :model => config[:model],
+            :fields => default_fields_for_forms,
             :persistent_config => config[:persistent_config],
             :ext_config => {
               :bbar => false,
@@ -334,17 +336,6 @@ module Netzke
           },
         },
         
-        # :edit_form => {
-        #   :class_name => "FormPanel",
-        #   :model => data_class.name,
-        #   :persistent_config => config[:persistent_config],
-        #   :ext_config => {
-        #     :bbar => false,
-        #     :header => false,
-        #     :mode => ext_config[:mode]
-        #   }
-        # },
-        
         :multi_edit_form => {
           :class_name => "GridPanel::RecordFormWindow",
           :ext_config => {
@@ -352,8 +343,9 @@ module Netzke
             :button_align => "right"
           },
           :item => {
-            :class_name => "FormPanel",
+            :class_name => "GridPanel::MultiEditForm",
             :model => config[:model],
+            :fields => default_fields_for_forms,
             :persistent_config => config[:persistent_config],
             :ext_config => {
               :bbar => false,
@@ -368,6 +360,7 @@ module Netzke
       res.merge!({
         :search_panel => {
           :class_name => "SearchPanel",
+          :fields => default_fields_for_forms,
           :search_class_name => config[:model],
           :persistent_config => config[:persistent_config],
           :ext_config => {

data/lib/netzke/grid_panel/grid_panel_columns.rb

@@ -216,6 +216,10 @@ module Netzke
             c[:editor] = assoc_method_type == :boolean ? editor_for_attr_type(:boolean) : editor_for_association
           end
         end
+        
+        def default_fields_for_forms
+          columns.map{ |c| {:name => c[:name]} }
+        end
       
       def self.included(receiver)
         receiver.extend         ClassMethods

data/lib/netzke/grid_panel/grid_panel_js.rb

@@ -28,10 +28,15 @@ module Netzke
           edit_in_form_events = <<-END_OF_JAVASCRIPT if config[:edit_in_form_available]
             if (this.enableEditInForm) {
               this.getSelectionModel().on('selectionchange', function(selModel){
-                // Disable "edit in form" button if new record is present in selection
-                var disabled = !selModel.each(function(r){
-                  if (r.isNew) { return false; }
-                });
+                var disabled;
+                if (!selModel.hasSelection()) {
+                  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; }
+                  });
+                };
                 this.actions.editInForm.setDisabled(disabled);
               }, this);
             }
@@ -111,23 +116,26 @@ module Netzke
                     c.editor = null;
                   }
 
+                  // Normalize the renderer
+                  this.normalizeRenderer(c);
+                  
                   // set the renderer
-                  if (c.renderer && !Ext.isArray(c.renderer) && c.renderer.match(/^\\s*function\\s*\\(/)) {
-                    // if the renderer is an inline function - eval it (double escaping because we are inside of the Ruby string here...)
-                    eval("c.renderer = " + c.renderer + ";");
-                  } else if (Ext.isFunction(this[c.renderer])) {
-                    // whether the renderer is defined in this.scope
-                    c.renderer = this[c.renderer].createDelegate(this);
-                  } else {
-                    // othrewise it's a string representing the name of the renderer or an json-encoded array,
-                    // where the first parameter is the renderer's name, and the rest - parameters that should be
-                    // passed to the renderer at the moment of calling
-                    var renderer = Ext.netzke.normalizedRenderer(c.renderer);
-                    if (renderer != null) {
-                      c.renderer = renderer
-                    };
-                  }
-                
+//                  if (c.renderer && !Ext.isArray(c.renderer) && c.renderer.match(/^\\s*function\\s*\\(/)) {
+//                    // if the renderer is an inline function - eval it (double escaping because we are inside of the Ruby string here...)
+//                    eval("c.renderer = " + c.renderer + ";");
+//                  } else if (Ext.isFunction(this[c.renderer])) {
+//                    // whether the renderer is defined in this.scope
+//                    c.renderer = this[c.renderer].createDelegate(this);
+//                  } else {
+//                    // othrewise it's a string representing the name of the renderer or a json-encoded array,
+//                    // where the first parameter is the renderer's name, and the rest - parameters that should be
+//                    // passed to the renderer at the moment of calling
+//                    var renderer = Ext.netzke.normalizedRenderer(c.renderer);
+//                    if (renderer != null) {
+//                      c.renderer = renderer
+//                    };
+//                  }
+//                
                   // add to the list
                   cmConfig.push(c);
                 }
@@ -584,6 +592,7 @@ module Netzke
                 }
               
                 this.getView().refresh();
+                this.getSelectionModel().fireEvent('selectionchange', this.getSelectionModel());
               }
             END_OF_JAVASCRIPT
           
@@ -600,6 +609,48 @@ module Netzke
                 this.getSelectionModel().resumeEvents();
               }
             END_OF_JAVASCRIPT
+            
+            # Normalizes the renderer for a column.
+            # Renderer may be:
+            # 1) a string that contains the name of the function to be used as renderer.
+            # 2) an array, where the first element is the function name, and the rest - the arguments
+            # that will be passed to that function along with the value to be rendered.
+            # The function is searched in the following objects: 1) Ext.util.Format, 2) this.
+            # If not found, it is simply evaluated. Handy, when as renderer we receive an inline JS function,
+            # or reference to a function in some other scope.
+            # So, these will work:
+            # * "uppercase"
+            # * ["ellipsis", 10]
+            # * ["substr", 3, 5]
+            # * "myRenderer" (if this.myRenderer is a function)
+            # * ["Some.scope.Format.customRenderer", 10, 20, 30] (if Some.scope.Format.customRenderer is a function)
+            # * "function(v){ return 'Value: ' + v; }"
+            :normalize_renderer => <<-END_OF_JAVASCRIPT.l,
+              function(c) {
+                if (!c.renderer) return;
+
+                var name, args = [];
+
+                if ('string' === typeof c.renderer) {
+                  name = c.renderer;
+                } else {
+                  name = c.renderer[0];
+                  args = c.renderer.slice(1);
+                }
+                
+                // 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);
+                } else if (Ext.isFunction(this[name])) {
+                  // ... then if our own class has it
+                  c.renderer = this[name].createDelegate(this, args, 1);
+                } else {
+                  // ... and, as last resort, evaluate it (allows passing inline javascript function as renderer)
+                  eval("c.renderer = " + c.renderer + ";");
+                }
+              }
+            END_OF_JAVASCRIPT
+            
           
             # :reorder_columns => <<-END_OF_JAVASCRIPT.l,
             #   function(columns){

data/lib/netzke/grid_panel/multi_edit_form.rb

@@ -0,0 +1,14 @@
+module Netzke
+  class GridPanel < Base
+    class MultiEditForm < FormPanel
+      
+      # Replace checkbox for boolean fields with tristate checkbox
+      def attr_type_to_xtype_map
+        super.merge({
+          :boolean => :tricheckbox
+        })
+      end
+      
+    end
+  end
+end

data/lib/netzke/search_panel.rb

@@ -149,11 +149,11 @@ module Netzke
 
       res.reject!{ |f| f[:virtual] }
       
-      res.each do |f| 
+      res.each do |f|
         f.merge!(:condition => "like", :default_value => nil)
         f.merge!(:xtype => xtype_for_attr_type(:string), :attr_type => "string") if f[:name].to_s.index("__")
-        f.merge!(:condition => "greater_than") if [:datetime, :integer, :date].include?(f[:attr_type].to_sym)
-        f.merge!(:condition => "equals") if f["attr_type"] == "boolean"
+        f.merge!(:condition => "greater_than") if [:datetime, :integer, :date].include?(f[:attr_type])
+        f.merge!(:condition => "equals") if f[:attr_type] == :boolean
       end
 
       res

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-basepack
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 5
-  - 9
-  version: 0.5.9
+  - 10
+  version: 0.5.10
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +02:00
+date: 2010-06-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,11 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 0
         - 5
-        - 2
-        version: 0.5.2
+        - 3
+        version: 0.5.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
@@ -55,6 +58,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
@@ -70,6 +74,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 1
@@ -130,6 +135,7 @@ files:
 - lib/netzke/grid_panel/grid_panel_columns.rb
 - lib/netzke/grid_panel/grid_panel_js.rb
 - lib/netzke/grid_panel/javascripts/rows-dd.js
+- lib/netzke/grid_panel/multi_edit_form.rb
 - lib/netzke/grid_panel/record_form_window.rb
 - lib/netzke/json_array_editor.rb
 - lib/netzke/masquerade_selector.rb
@@ -143,8 +149,8 @@ files:
 - lib/netzke/tree_panel.rb
 - lib/netzke/window.rb
 - lib/netzke/wrapper.rb
+- lib/tasks/netzke_basepack_tasks.rake
 - stylesheets/basepack.css
-- 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
@@ -199,7 +205,21 @@ has_rdoc: true
 homepage: http://github.com/skozlov/netzke-basepack
 licenses: []
 
-post_install_message: "\n    ========================================================================\n\n               Thanks for installing Netzke Basepack!\n               \n      Run \"./script/generate netzke_basepack\" to finish the installation.\n\n      Netzke home page:     http://netzke.org\n      Netzke Google Groups: http://groups.google.com/group/netzke\n      Netzke tutorials:     http://blog.writelesscode.com\n\n    ========================================================================\n\n"
+post_install_message: |+
+  
+  ========================================================================
+  
+             Thanks for installing Netzke Basepack!
+             
+    Don't forget to run "./script/generate netzke_basepack" for each 
+    Rails app that will be using this gem.
+  
+    Netzke home page:     http://netzke.org
+    Netzke Google Groups: http://groups.google.com/group/netzke
+    Netzke tutorials:     http://blog.writelesscode.com
+  
+  ========================================================================
+  
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -209,6 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -217,6 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"