netzke-basepack 0.7.1 → 0.7.2

data/lib/netzke/basepack/grid_panel/columns.rb

@@ -109,6 +109,19 @@ module Netzke
           @default_columns ||= load_model_level_attrs || data_class.netzke_attributes
         end
 
+        # Columns that were overridden with :override_columns config option.
+        def overridden_default_columns
+          if config[:override_columns].present?
+            result = []
+            default_columns.each do |col|
+              result << col.merge(config[:override_columns][col[:name].to_sym] || {})
+            end
+            result
+          else
+            default_columns
+          end
+        end
+
         # Columns that represent a smart merge of default_columns and columns passed during the configuration.
         def initial_columns(with_excluded = false)
           # Normalize here, as from the config we can get symbols (names) instead of hashes
@@ -121,13 +134,13 @@ module Netzke
             # reverse-merge each column hash from config with each column hash from exposed_attributes
             # (columns from config have higher priority)
             for c in columns_from_config
-              corresponding_default_column = default_columns.find{ |k| k[:name] == c[:name] }
+              corresponding_default_column = overridden_default_columns.find{ |k| k[:name] == c[:name] }
               c.reverse_merge!(corresponding_default_column) if corresponding_default_column
             end
             columns_for_create = columns_from_config
           else
             # we didn't have columns configured in component's config, so, use the columns from the data class
-            columns_for_create = default_columns
+            columns_for_create = overridden_default_columns
           end
 
           filter_out_excluded_columns(columns_for_create) unless with_excluded
@@ -155,10 +168,10 @@ module Netzke
             set_default_xtype(c)
             set_default_virtual(c)
             set_default_text(c)
+            set_default_editable(c)
             set_default_editor(c)
             set_default_width(c)
             set_default_hidden(c)
-            set_default_editable(c)
             set_default_sortable(c)
             set_default_filterable(c)
             c[:assoc] = association_attr?(c)
@@ -182,6 +195,7 @@ module Netzke
             else
               c[:editor] ||= editor_for_attr_type(c[:attr_type])
             end
+
           end
 
           def set_default_width(c)
@@ -195,7 +209,7 @@ module Netzke
 
           def set_default_editable(c)
             if c[:editable].nil?
-              c[:editable] = is_editable_column?(c) || nil
+              c[:editable] = is_editable_column?(c)
             end
           end
 
@@ -314,12 +328,9 @@ module Netzke
           # Default fields that will be displayed in the Add/Edit/Search forms
           # When overriding this method, keep in mind that the fields inside the layout must be expanded (each field represented by a hash, not just a symbol)
           def default_fields_for_forms
-            form_klass = constantize_class_name("Netzke::ModelExtensions::#{config[:model]}ForFormPanel") || original_data_class
-
-            # Select only those fields that are known to the form_klass
             selected_columns = columns.select do |c|
-              form_klass.column_names.include?(c[:name]) ||
-              form_klass.instance_methods.include?("#{c[:name]}=") ||
+              data_class.column_names.include?(c[:name]) ||
+              data_class.instance_methods.include?("#{c[:name]}=") ||
               association_attr?(c[:name])
             end
 

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

@@ -15,7 +15,6 @@
     Ext.Msg.confirm(this.i18n.confirmation, this.i18n.areYouSure, function(btn){
       if (btn == 'yes') {
         var records = [];
-        var selection = this.getView().getSelectedNodes();
         this.getSelectionModel().selected.each(function(r){
           if (r.isNew) {
             // this record is not know to server - simply remove from store

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

@@ -28,7 +28,7 @@
 
       if (c.name !== '_meta') fieldConfig.type = this.fieldTypeForAttrType(c.attrType); // field type (grid editors need this to function well)
 
-      if (c.attrType == 'datetime') {
+      if (c.attrType == 'datetime' || c.attrType == 'date') {
         fieldConfig.dateFormat = 'Y-m-d g:i:s'; // in this format we receive dates from the server
       };
 

data/lib/netzke/basepack/grid_panel/record_form_window.rb

@@ -2,12 +2,12 @@ module Netzke
   module Basepack
     class GridPanel < Netzke::Base
       class RecordFormWindow < Window
-        js_properties :button_align => :right
 
-        config :modal => true,
-               :width => 400,
-               :auto_height => true,
-               :fbar => [:ok.action, :cancel.action]
+        js_properties :button_align => :right,
+                      :width => 400,
+                      :auto_height => true,
+                      :modal => true,
+                      :fbar => [:ok.action, :cancel.action]
 
         action :ok do
           { :text => I18n.t('netzke.basepack.grid_panel.record_form_window.actions.ok')}

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

@@ -137,7 +137,6 @@ module Netzke
 
           if mod_records_count > 0
             on_data_changed
-            flash :notice => "Updated #{mod_records_count} records."
             {:set_result => "ok", :netzke_feedback => @flash}.to_nifty_json
           else
             {:netzke_feedback => @flash}.to_nifty_json

data/lib/netzke/basepack/version.rb

@@ -3,7 +3,7 @@ module Netzke
     module Version
       MAJOR = 0
       MINOR = 7
-      PATCH = 1
+      PATCH = 2
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end

data/netzke-basepack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-basepack}
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Sergei Kozlov}]
-  s.date = %q{2011-09-04}
+  s.date = %q{2011-10-20}
   s.description = %q{A set of full-featured extendible Netzke components (such as FormPanel, GridPanel, Window, BorderLayoutPanel, etc) which can be used as building block for your RIA}
   s.email = %q{sergei@playcode.nl}
   s.extra_rdoc_files = [
@@ -40,6 +40,8 @@ Gem::Specification.new do |s|
     "lib/netzke/active_record/relation_extensions.rb",
     "lib/netzke/basepack.rb",
     "lib/netzke/basepack/accordion_panel.rb",
+    "lib/netzke/basepack/action_column.rb",
+    "lib/netzke/basepack/action_column/javascripts/action_column.js",
     "lib/netzke/basepack/auth_app.rb",
     "lib/netzke/basepack/basic_app.rb",
     "lib/netzke/basepack/border_layout_panel.rb",
@@ -63,7 +65,6 @@ Gem::Specification.new do |s|
     "lib/netzke/basepack/grid_panel/javascripts/grid_panel.js",
     "lib/netzke/basepack/grid_panel/javascripts/misc.js",
     "lib/netzke/basepack/grid_panel/javascripts/rows-dd.js",
-    "lib/netzke/basepack/grid_panel/multi_edit_form.rb",
     "lib/netzke/basepack/grid_panel/record_form_window.rb",
     "lib/netzke/basepack/grid_panel/services.rb",
     "lib/netzke/basepack/paging_form_panel.rb",
@@ -105,11 +106,13 @@ Gem::Specification.new do |s|
     "test/basepack_test_app/app/components/book_form_with_nested_attributes.rb",
     "test/basepack_test_app/app/components/book_grid.rb",
     "test/basepack_test_app/app/components/book_grid_loader.rb",
+    "test/basepack_test_app/app/components/book_grid_with_column_actions.rb",
     "test/basepack_test_app/app/components/book_grid_with_custom_columns.rb",
     "test/basepack_test_app/app/components/book_grid_with_default_values.rb",
     "test/basepack_test_app/app/components/book_grid_with_extra_feedback.rb",
     "test/basepack_test_app/app/components/book_grid_with_extra_filters.rb",
     "test/basepack_test_app/app/components/book_grid_with_nested_attributes.rb",
+    "test/basepack_test_app/app/components/book_grid_with_overridden_columns.rb",
     "test/basepack_test_app/app/components/book_grid_with_paging.rb",
     "test/basepack_test_app/app/components/book_grid_with_persistence.rb",
     "test/basepack_test_app/app/components/book_grid_with_scoped_authors.rb",
@@ -187,12 +190,14 @@ Gem::Specification.new do |s|
     "test/basepack_test_app/db/migrate/20110213213050_create_netzke_component_states.rb",
     "test/basepack_test_app/db/migrate/20110701070052_create_book_with_custom_primary_keys.rb",
     "test/basepack_test_app/db/migrate/20110901114016_add_last_read_at_to_books.rb",
+    "test/basepack_test_app/db/migrate/20110909071740_add_published_on_to_books.rb",
     "test/basepack_test_app/db/schema.rb",
     "test/basepack_test_app/db/seeds.rb",
     "test/basepack_test_app/features/accordion_panel.feature",
     "test/basepack_test_app/features/components_in_view.feature",
     "test/basepack_test_app/features/form_panel.feature",
     "test/basepack_test_app/features/grid_panel.feature",
+    "test/basepack_test_app/features/grid_panel_filters.feature",
     "test/basepack_test_app/features/grid_panel_with_custom_primary_key.feature",
     "test/basepack_test_app/features/grid_sorting.feature",
     "test/basepack_test_app/features/i18n.feature",
@@ -287,16 +292,16 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<netzke-core>, ["~> 0.7.0"])
+      s.add_runtime_dependency(%q<netzke-core>, ["~> 0.7.4"])
       s.add_runtime_dependency(%q<will_paginate>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<acts_as_list>, ["~> 0.1.4"])
     else
-      s.add_dependency(%q<netzke-core>, ["~> 0.7.0"])
+      s.add_dependency(%q<netzke-core>, ["~> 0.7.4"])
       s.add_dependency(%q<will_paginate>, ["~> 3.0.0"])
       s.add_dependency(%q<acts_as_list>, ["~> 0.1.4"])
     end
   else
-    s.add_dependency(%q<netzke-core>, ["~> 0.7.0"])
+    s.add_dependency(%q<netzke-core>, ["~> 0.7.4"])
     s.add_dependency(%q<will_paginate>, ["~> 3.0.0"])
     s.add_dependency(%q<acts_as_list>, ["~> 0.1.4"])
   end

data/test/basepack_test_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: vendor/gems/netzke-core
   specs:
-    netzke-core (0.7.2)
+    netzke-core (0.7.4)
       activesupport (>= 3.0.0)
 
 PATH

data/test/basepack_test_app/app/components/author_grid.rb

@@ -1,7 +1,3 @@
 class AuthorGrid < Netzke::Basepack::GridPanel
-  def default_config
-    super.merge(
-      :model => "Author"
-    )
-  end
+  model "Author"
 end

data/test/basepack_test_app/app/components/book_form.rb

@@ -1,30 +1,32 @@
 # Warning: this component participates in i18n.feature, careful with adding new fields!
 class BookForm < Netzke::Basepack::FormPanel
-  js_property :title, Book.model_name.human
+  extend Extras::BookPresentation
 
-  include Extras::BookPresentation
+  title Book.model_name.human
 
-  def configuration
-    super.merge(
-      :model => "Book",
-      :record => Book.first,
-      :items => [
-        :title,
-        {:name => :author__first_name, :setter => author_first_name_setter},
-        {:name => :author__last_name, :xtype => :displayfield},
-        {:name => :rating, :xtype => :combo, :store => [[1, "Good"], [2, "Average"], [3, "Poor"]]},
-        {:name => :author__updated_at, :editable => false},
-        :digitized,
-        :exemplars,
-        {:name => :in_abundance, :getter => in_abundance_getter, :xtype => :displayfield},
-        {:name => :updated_at}
-        # WIP: commalistcbg is kind of broken, giving an Ext error
-        # {:name => :tags, :xtype => :commalistcbg, :options => %w(read cool recommend buy)},
-        # WIP: waithing on nradiogroup
-        # {:name => :rating, :xtype => :nradiogroup, :options => [[1, "Good"], [2, "Average"], [3, "Poor"]]}
-      ]
-    )
-  end
+  model "Book"
+
+  record_id Book.first.try(:id)
+
+  items [
+    :title,
+    {:name => :author__first_name, :setter => author_first_name_setter},
+    :author__name,
+    {:name => :author__last_name, :xtype => :displayfield},
+    {:name => :rating, :xtype => :combo, :store => [[1, "Good"], [2, "Average"], [3, "Poor"]]},
+    {:name => :author__updated_at, :editable => false},
+    :digitized,
+    :exemplars,
+    {:name => :in_abundance, :getter => in_abundance_getter, :xtype => :displayfield},
+    {:name => :updated_at},
+    :last_read_at,
+    :published_on
+
+    # WIP: commalistcbg is kind of broken, giving an Ext error
+    # {:name => :tags, :xtype => :commalistcbg, :options => %w(read cool recommend buy)},
+    # WIP: waithing on nradiogroup
+    # {:name => :rating, :xtype => :nradiogroup, :options => [[1, "Good"], [2, "Average"], [3, "Poor"]]}
+  ]
 
   js_method :init_component, <<-JS
     function(){
@@ -33,5 +35,4 @@ class BookForm < Netzke::Basepack::FormPanel
     }
   JS
 
-
 end

data/test/basepack_test_app/app/components/book_grid.rb

@@ -1,12 +1,9 @@
 class BookGrid < Netzke::Basepack::GridPanel
-  js_property :title, I18n.t('books', :default => "Books")
+  title I18n.t('books', :default => "Books")
 
-  def default_config
-    super.merge(
-      :model => "Book",
-      # :prohibit_update => true
-      # :columns => [{:name => :author__first_name, :read_only => true}, :exemplars, {:name => :digitized, :xtype => :checkcolumn, :editable => false}]
-      # :columns => [{:name => :title, :editable => false, :editor => {:xtype => :datefield}}, :exemplars, :digitized, :notes]
-    )
-  end
+  model "Book"
+
+  add_form_config :class_name => "BookForm"
+  edit_form_config :class_name => "BookForm"
+  multi_edit_form_config :class_name => "BookForm"
 end

data/test/basepack_test_app/app/components/book_grid_with_column_actions.rb

@@ -0,0 +1,15 @@
+# Implements a column action :delete_row
+class BookGridWithColumnActions < Netzke::Basepack::GridPanel
+  include Netzke::Basepack::ActionColumn
+
+  model "Book"
+
+  column_action :delete_row, :icon => "#{Netzke::Core.ext_uri}/resources/themes/images/default/tree/drop-no.gif"
+
+  js_method :on_delete_row, <<-JS
+    function(record){
+      this.getSelectionModel().select(record);
+      this.onDel();
+    }
+  JS
+end

data/test/basepack_test_app/app/components/book_grid_with_custom_columns.rb

@@ -1,29 +1,22 @@
 class BookGridWithCustomColumns < Netzke::Basepack::GridPanel
   js_property :title, "Books"
 
-  def default_config
-    super.merge(
-      :model => "Book",
-      :columns => [
-        {:name => :author__first_name, :renderer => :my_renderer},
-        {:name => :author__last_name, :renderer => :uppercase},
-        {:name => :author__name, :flex => 1, :text => "Author"},
-        {:name => :title, :flex => 1},
-        {:name => :digitized},
-        {
-          :name => :rating,
-          :editor => {
-            :trigger_action => :all,
-            :xtype => :combo,
-            :store => [[1, "Good"], [2, "Average"], [3, "Poor"]]
-          },
-          :renderer => "function(v){return ['', 'Good', 'Average', 'Poor'][v];}"
-        },
-        :exemplars,
-        {:name => :updated_at}
-      ]
-    )
-  end
+  model "Book"
+
+  column :author__first_name, :renderer => :my_renderer
+  column :author__last_name, :renderer => :uppercase
+  column :author__name, :flex => 1, :text => "Author"
+  column :title, :flex => 1
+  column :digitized
+  column :rating,
+    :editor => {
+      :trigger_action => :all,
+      :xtype => :combo,
+      :store => [[1, "Good"], [2, "Average"], [3, "Poor"]]
+    },
+    :renderer => "function(v){return ['', 'Good', 'Average', 'Poor'][v];}"
+  column :exemplars
+  column :updated_at
 
   js_method :my_renderer, <<-JS
     function(value){

data/test/basepack_test_app/app/components/book_grid_with_default_values.rb

@@ -1,11 +1,9 @@
 class BookGridWithDefaultValues < Netzke::Basepack::GridPanel
+  model "Book"
   js_property :title, "Books"
 
-  def default_config
-    super.merge(
-      :model => "Book",
-      :columns => [{:name => 'title', :default_value => "Lolita"}, {:name => 'author__last_name', :default_value => Author.first.id}, {:name => 'exemplars', :default_value => 100}, {:name => 'digitized', :default_value => true}]
-    )
-  end
-
+  column :title, :default_value => "Lolita"
+  column :author__last_name, :default_value => Author.first.id
+  column :exemplars, :default_value => 100
+  column :digitized, :default_value => true
 end

data/test/basepack_test_app/app/components/book_grid_with_extra_feedback.rb

@@ -1,10 +1,7 @@
 class BookGridWithExtraFeedback < Netzke::Basepack::GridPanel
-  def default_config
-    super.merge(
-      :model => "Book"
-    )
-  end
+  model "Book"
 
+  # Override the get_data endpoint
   def get_data_endpoint(params)
     super.merge(:netzke_feedback => "Data loaded!")
   end

data/test/basepack_test_app/app/components/book_grid_with_overridden_columns.rb

@@ -0,0 +1,15 @@
+class BookGridWithOverriddenColumns < Netzke::Basepack::GridPanel
+  model "Book"
+
+  # First way to override a column
+  override_column :title, :renderer => "uppercase"
+
+  # Second way to override a column
+  # def default_config
+  #   super.tap do |c|
+  #     c[:override_columns] = {
+  #       :title => {:renderer => "uppercase"}
+  #     }
+  #   end
+  # end
+end

data/test/basepack_test_app/app/components/book_grid_with_persistence.rb

@@ -1,5 +1,4 @@
 class BookGridWithPersistence < BookGrid
-
   def default_config
     super.merge :persistence => true
   end

data/test/basepack_test_app/app/components/book_paging_form_panel.rb

@@ -10,12 +10,12 @@ class BookPagingFormPanel < Netzke::Basepack::PagingFormPanel
         :flex => 2,
         :layout => :anchor,
         :defaults => {:anchor => "-8"},
-        :items => [:title, :notes, :digitized, :created_at, :updated_at]
+        :items => [:title, :notes, :digitized, :created_at, :updated_at, :last_read_at]
       },{
         :flex => 1,
         :layout => :anchor,
         :defaults => {:anchor => "-8"},
-        :items => [:author__name, {:name => :author__first_name, :read_only => true}, :exemplars]
+        :items => [:author__name, {:name => :author__first_name, :read_only => true}, :exemplars, :published_on]
       }]}]
     })
   end