netzke-basepack 0.5.13 → 0.5.14

data/CHANGELOG.rdoc

@@ -1,3 +1,18 @@
+= v0.5.14 - 2010-09-08
+* bug fix
+  * fields configurator wouldn't open in some cases
+  * icons location was hardcoded in search panel (credits to @pschyska)
+  * quick fix for datetimes not being displayed in the preferred timezone
+  * ext_config options :enable_edit_in_form and :enable_advanced_search now do have effect
+  * PropertyEditor fixed for Grid/FormPanel
+  * Grid/FormPanel again obeys persistent_config option when loading columns/fields
+
+* enhancements
+  * numberfield is default in grids also for columns of type float
+  * more narrow exception rescuing in GridPanel code
+  * combobox options can now be searched ("type ahead") also in virtual columns (not efficient though, use at own risk!)
+  * overriding an already existing attribute with `netzke_attribute` now also has effect on association attributes, such as boss__name
+
 = v0.5.13 - 2010-08-11
 * regression
   * combobox options configuration again has effect

data/Rakefile

@@ -1,7 +1,7 @@
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
-    gemspec.version = "0.5.13"
+    gemspec.version = "0.5.14"
     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,7 +9,7 @@ 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.4")
+    gemspec.add_dependency("netzke-core", ">=0.5.5")
     gemspec.add_dependency("searchlogic", ">=2.0.0")
     gemspec.add_dependency("will_paginate", ">=2.0.0")
     gemspec.add_dependency("acts_as_list", ">=0.1.2")

data/TODO.rdoc

@@ -1,10 +1,10 @@
 == Priority
-* Add icons to buttons to actions (toolbars/menus)
+* Solve the confusion about columns being stored in the persistent config
 * On grid refresh, reset the dirty fields, so that the "Apply" button doesn't do anything
 * GridPanel's read_only vs editable (doesn't work now) options
-* Solve the confusion about columns being stored in the persistent config
 * Inclusion of css in a stand-alone widget
-* Rename the "l" method to something else
+* Find a way to print the grid nicely (along with the column and rows that don't fit on the screen)
+* Auto-include the ID column into GridPanel by default
 
 == Foolproof
 * Should not be possible delete the "ID" field from grids/forms

data/lib/netzke/active_record/attributes.rb

@@ -69,16 +69,30 @@ module Netzke::ActiveRecord::Attributes
         end
       end
       
+      # Returns netzke attributes in the order of columns in the table, followed by extra declared attributes
+      # Detects one-to-many association columns and replaces the name of the column with association column name (Netzke style), e.g.:
+      # 
+      #   role_id => role__name
       def netzke_attrs_in_natural_order
         (
           declared_attrs = netzke_declared_attributes
           column_names.map do |name|
             c = {:name => name, :attr_type => columns_hash[name].type}
+            
+            # If it's named as foreign key of some association, then it's an association column
+            assoc = reflect_on_all_associations.detect{|a| a.primary_key_name == c[:name]}
+
+            if assoc && !assoc.options[:polymorphic]
+              assoc_method = %w{name title label id}.detect{|m| (assoc.klass.instance_methods + assoc.klass.column_names).include?(m) } || assoc.klass.primary_key
+              c[:name] = "#{assoc.name}__#{assoc_method}"
+              c[:attr_type] = assoc.klass.columns_hash[assoc_method].type
+            end
+            
             # auto set up the default value from the column settings
             c.merge!(:default_value => columns_hash[name].default) if columns_hash[name].default
             
             # if there's a declared attr with the same name, simply merge it with what's taken from the model's columns
-            if declared = declared_attrs.detect{ |va| va[:name] == name }
+            if declared = declared_attrs.detect{ |va| va[:name] == c[:name] }
               c.merge!(declared)
               declared_attrs.delete(declared)
             end

data/lib/netzke/active_record/data_accessor.rb

@@ -8,8 +8,12 @@ module Netzke::ActiveRecord
       res = []
       for c in columns
         begin
-          res << send(c[:name]) unless c[:included] == false
-        rescue
+          next if c[:included] == false
+          v = send(c[:name])
+          # a work-around for to_json not taking the current timezone into account when serializing ActiveSupport::TimeWithZone
+          v = v.to_datetime.to_s(:db) if v.is_a?(ActiveSupport::TimeWithZone)
+          res << v 
+        rescue NoMethodError
           # So that we don't crash at a badly configured column
           res << "UNDEF"
         end

data/lib/netzke/data_accessor.rb

@@ -36,10 +36,14 @@ module Netzke
             end
           end
         
-          # apply query
-          search.send("#{assoc_method}_like", "#{method_options[:query]}%") if method_options[:query]
+          if assoc.klass.column_names.include?(assoc_method)
+            # apply query
+            search.send("#{assoc_method}_like", "#{method_options[:query]}%") if method_options[:query]
+            search.all.map{ |r| [r.send(assoc_method)] }
+          else
+            search.all.map{ |r| r.send(assoc_method) }.select{ |value| value =~ /^#{method_options[:query]}/  }.map{ |v| [v] }
+          end
         
-          search.all.map{ |r| [r.send(assoc_method)] }
         else
           # Options for a non-association attribute
           data_class.options_for(column[:name], method_options[:query]).map{|s| [s]}

data/lib/netzke/form_panel.rb

@@ -125,9 +125,9 @@ module Netzke
     
     def self.property_fields
       res = [
-        {:name => "ext_config__title",               :type => :string},
-        {:name => "ext_config__header",              :type => :boolean, :default => true},
-        # {:name => "ext_config__bbar",              :type => :json}
+        {:name => "ext_config__title",               :attr_type => :string},
+        {:name => "ext_config__header",              :attr_type => :boolean, :default => true},
+        # {:name => "ext_config__bbar",              :attr_type => :json}
       ]
       
       res

data/lib/netzke/form_panel/form_panel_fields.rb

@@ -91,7 +91,7 @@ module Netzke
         end
         
         def load_model_level_attrs
-          NetzkeModelAttrList.read_list(data_class.name) if data_class
+          NetzkeModelAttrList.read_list(data_class.name) if persistent_config_enabled? && data_class
         end
         
         def set_default_field_label(c)
@@ -133,7 +133,7 @@ module Netzke
 
         # Receives 2 arrays of columns. Merges the missing config from the +source+ into +dest+, matching columns by name
         def reverse_merge_equally_named_fields(dest, source)
-          dest.each{ |dc| dc.reverse_merge!(source.detect{ |sc| sc[:name] == dc[:name] }) }
+          dest.each{ |dc| dc.reverse_merge!(source.detect{ |sc| sc[:name] == dc[:name] } || {}) }
         end
         
       

data/lib/netzke/grid_panel.rb

@@ -206,37 +206,28 @@ module Netzke
     # Fields to be displayed in the "General" tab of the configuration panel
     def self.property_fields
       [
-        {:name => :ext_config__title,               :type => :string},
-        {:name => :ext_config__header,              :type => :boolean, :default => true},
-        {:name => :ext_config__enable_context_menu, :type => :boolean, :default => true},
-        {:name => :ext_config__enable_pagination,   :type => :boolean, :default => true},
-        {:name => :ext_config__rows_per_page,       :type => :integer},
-        {:name => :ext_config__prohibit_create,     :type => :boolean},
-        {:name => :ext_config__prohibit_update,     :type => :boolean},
-        {:name => :ext_config__prohibit_delete,     :type => :boolean},
-        {:name => :ext_config__prohibit_read,       :type => :boolean}
+        {: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}
       ]
     end
     
-    def default_config
-      res = super
-      
-      res[:ext_config][:bbar] = default_bbar
-      res[:ext_config][:context_menu] = default_context_menu
-      
-      res
-    end
-    
     def default_bbar
       res = %w{ add edit apply del }
-      res << "-" << "add_in_form" << "edit_in_form" if self.class.config[:edit_in_form_available]
-      res << "-" << "search" if self.class.config[:extended_search_available]
+      res << "-" << "add_in_form" << "edit_in_form" if ext_config[:enable_edit_in_form]
+      res << "-" << "search" if ext_config[:enable_extended_search]
       res
     end
     
     def default_context_menu
       res = %w{ edit del }
-      res << "-" << "edit_in_form" if self.class.config[:edit_in_form_available]
+      res << "-" << "edit_in_form" if ext_config[:enable_edit_in_form]
       res
     end
     

data/lib/netzke/grid_panel/grid_panel_columns.rb

@@ -112,7 +112,7 @@ module Netzke
       
         # Stores modified columns in persistent storage
         def save_columns!
-          NetzkeFieldList.update_list_for_current_authority(global_id, columns(false), original_data_class.name)
+          NetzkeFieldList.update_list_for_current_authority(global_id, columns(false), original_data_class.name) if persistent_config_enabled?
         end
       
         def load_columns
@@ -120,7 +120,7 @@ module Netzke
         end
         
         def load_model_level_attrs
-          NetzkeModelAttrList.read_list(data_class.name)
+          NetzkeModelAttrList.read_list(data_class.name) if persistent_config_enabled?
         end
         
         # whether a column is bound to the primary_key
@@ -181,31 +181,19 @@ module Netzke
         end
       
         # Detects an association column and sets up the proper editor.
-        # If a column is a foreign key (e.g. "category_id"), also renames the column into "normalized" association column, e.g.:
-        #   category__name
-        # If association doesn't respond to methods "name", "title" or "label", falls back to "id", e.g.:
-        #   category__id
         def detect_association(c)
-          # named as foreign key of some association?
-          assoc = data_class.reflect_on_all_associations.detect{|a| a.primary_key_name == c[:name]}
-          
-          if assoc && !assoc.options[:polymorphic]
-            assoc_method = %w{name title label id}.detect{|m| (assoc.klass.instance_methods + assoc.klass.column_names).include?(m) } || assoc.klass.primary_key
-            c[:name] = "#{assoc.name}__#{assoc_method}"
-          end
-          
-          # named with an double-underscore notation? surely an association column then
-          if !assoc && c[:name].index('__')
+          # double-underscore notation? surely an association column
+          if c[:name].index('__')
             assoc_name, assoc_method = c[:name].split('__')
             assoc = data_class.reflect_on_association(assoc_name.to_sym)
-          end
           
-          if assoc && assoc_method
-            assoc_column = assoc.klass.columns_hash[assoc_method]
-            assoc_method_type = assoc_column.try(:type)
+            if assoc && assoc_method
+              assoc_column = assoc.klass.columns_hash[assoc_method]
+              assoc_method_type = assoc_column.try(:type)
             
-            # if association column is boolean, display a checkbox (or alike), otherwise - a combobox (or alike)
-            c[:editor] ||= assoc_method_type == :boolean ? editor_for_attr_type(:boolean) : editor_for_association
+              # if association column is boolean, display a checkbox (or alike), otherwise - a combobox (or alike)
+              c[:editor] ||= assoc_method_type == :boolean ? editor_for_attr_type(:boolean) : editor_for_association
+            end
           end
         end
         
@@ -233,7 +221,7 @@ module Netzke
         
         # Receives 2 arrays of columns. Merges the missing config from the +source+ into +dest+, matching columns by name
         def reverse_merge_equally_named_columns(dest, source)
-          dest.each{ |dc| dc.reverse_merge!(source.detect{ |sc| sc[:name] == dc[:name] }) }
+          dest.each{ |dc| dc.reverse_merge!(source.detect{ |sc| sc[:name] == dc[:name] } || {}) }
         end
 
       def self.included(receiver)

data/lib/netzke/grid_panel/grid_panel_js.rb

@@ -8,6 +8,8 @@ module Netzke
       # to the JavaScript side.
       def js_config
         super.merge(
+          :bbar => ext_config.has_key?(:bbar) ? ext_config[:bbar] : default_bbar,
+          :context_menu => ext_config.has_key?(:context_menu) ? ext_config[:context_menu] : default_context_menu,
           :clmns => columns, # columns
           :model => config[:model], # the model name
           :inline_data => (get_data if ext_config[:load_inline_data]), # inline data (loaded along with the grid panel)

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

@@ -249,6 +249,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
 
   attrTypeEditorMap: {
     integer  : "numberfield",
+    "float"  : "numberfield",
     "boolean": "checkbox",
     decimal  : "numberfield",
     datetime : "xdatetime",

data/lib/netzke/search_panel.rb

@@ -34,8 +34,8 @@ module Netzke
     
     def actions
       super.merge(
-        :save => {:text => "Save", :icon => "/images/icons/disk.png"},
-        :del => {:text => "Delete", :icon => "/images/icons/delete.png"}
+        :save => {:text => "Save", :icon => Netzke::Base.config[:with_icons] && (Netzke::Base.config[:icons_uri] + "disk.png")},
+        :del => {:text => "Delete", :icon => Netzke::Base.config[:with_icons] && (Netzke::Base.config[:icons_uri] + "delete.png")}
       )
     end
     

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-basepack
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 0
   - 5
-  - 13
-  version: 0.5.13
+  - 14
+  version: 0.5.14
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 +02:00
+date: 2010-09-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +25,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         - 5
-        - 4
-        version: 0.5.4
+        - 5
+        version: 0.5.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 0
         - 1
@@ -208,21 +203,9 @@ has_rdoc: true
 homepage: http://github.com/skozlov/netzke-basepack
 licenses: []
 
-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
-  
-  ========================================================================
-  
+post_install_message: "\n\
+  ========================================================================\n\n           Thanks for installing Netzke Basepack!\n           \n  Don't forget to run \"./script/generate netzke_basepack\" for each \n  Rails app that will be using this gem.\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"
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -232,7 +215,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -241,7 +223,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"