netzke-basepack 0.5.2 → 0.5.3

data/lib/netzke/plugins/configuration_tool.rb

@@ -28,7 +28,7 @@ module Netzke::Plugins
     module ClassMethods
       def js_extend_properties_with_config_tool
         js_extend_properties_without_config_tool.merge({
-          :gear => <<-END_OF_JAVASCRIPT.l
+          :on_gear => <<-END_OF_JAVASCRIPT.l
             function(){
               var w = new Ext.Window({
                 title:'Config - '+ this.dataClassName,
@@ -110,7 +110,7 @@ module Netzke::Plugins
   
     def js_config_with_config_tool
       orig_config = js_config_without_config_tool
-      orig_config.merge(:configurable => config[:persistent_config])
+      orig_config.merge(:configurable => persistent_config_enabled?)
     end
   
     def config_tool_needed?

data/lib/netzke/property_editor.rb

@@ -6,10 +6,8 @@ module Netzke
       @widget = @passed_config[:widget]
     end
     
-    def independent_config
-      res = super
-      res[:ext_config][:bbar] = %w{ restore_defaults }
-      res
+    def default_bbar
+      %w{ restore_defaults }
     end
 
     def actions
@@ -33,7 +31,7 @@ module Netzke
         :label_width => 200,
         
         # Disable the 'gear' tool for now
-        :gear => <<-END_OF_JAVASCRIPT.l,
+        :on_gear => <<-END_OF_JAVASCRIPT.l,
           function(){
             this.feedback("You can't configure property editor (yet)");
           }
@@ -79,27 +77,33 @@ module Netzke
       fields = @widget.class.property_fields
       data.each_pair do |property, value|
         field = fields.detect{ |f| f[:name] == property.to_sym }
-        # default = @widget.config[property].nil? ? field[:default] : @widget.config[property]
         default = @widget.flat_initial_config(property).nil? ? field[:default] : @widget.flat_initial_config(property)
-        # Only store the value in persistent config when it's different from the default one
+
+        new_value = normalize_form_value(value, field)
+
+       # Only store the value in persistent config when it's different from the default one
         if field[:type] == :boolean
           # handle boolean type separately
-          value = value.to_b
-          @widget.persistent_config[property] = value ^ default ? value : nil
+          @widget.persistent_config[property] = new_value ^ default ? new_value : nil
         else 
-          if field[:type] == :json
-            value = ActiveSupport::JSON.decode(value)
-          end
-
-          # Empty string means "null" for now...
-          # value = nil if value.blank?
-          # logger.debug "!!! value: #{value.inspect}\n"
-          
-          @widget.persistent_config[property] = default == value ? nil : value
+          @widget.persistent_config[property] = default == new_value ? nil : new_value
         end
       end
       {}
     end
     
+    def normalize_form_value(value, field)
+      case field[:type]
+      when :boolean
+        value.to_b
+      when :json
+        ActiveSupport::JSON.decode(value) # no need to check for exceptions, as the value has been validated in browser
+      when :integer
+        value.to_i
+      else
+        value # TODO: support other types like :date and :datetime
+      end
+    end
+    
   end
 end

data/lib/netzke/tree_panel.rb

@@ -5,69 +5,21 @@ class Netzke::TreePanel < Netzke::Base
     "Ext.tree.TreePanel"
   end
   
-  def self.js_common_config_for_constructor
-    super.merge({
-      :root => {:text => '/', :id => 'source'},
-      :loader => {:data_url => "config.api.getChildren".l}
-    })
-  end
-  
   def self.js_extend_properties
     {
-      :refresh_handler => <<-END_OF_JAVASCRIPT.l,
-        function(){
-          console.info('refresh!');
-        }
-      END_OF_JAVASCRIPT
-
-      :add_handler => <<-END_OF_JAVASCRIPT.l,
-        function(e){
-          console.info(e);
-        }
-      END_OF_JAVASCRIPT
-
-      :edit_handler => <<-END_OF_JAVASCRIPT.l,
-        function(e){
-          console.info(e);
-        
-        }
-      END_OF_JAVASCRIPT
-
-      :delete_handler => <<-END_OF_JAVASCRIPT.l
-        function(e){
-          console.info(e);
-        
-        }
-      END_OF_JAVASCRIPT
-    }
-  end
-  
-  def actions
-    { :add    => {:text => 'Add'},
-      :edit   => {:text => 'Edit'},
-      :del => {:text => 'Delete', :disabled => true}
+      :root => {:text => '/', :id => 'source'}
     }
   end
   
-  def bbar
-    persistent_config[:bbar] ||= config[:bbar] == false ? nil : config[:bbar] || %w{ add edit delete }
-  end
-  
-  def tools
-    persistent_config[:tools] ||= config[:tools] == false ? nil : config[:tools] #|| %w{ gear refresh }
-  end
-  
-  def tbar
-    persistent_config[:tbar] ||= config[:tbar] == false ? nil : config[:tbar]
-  end
-
-  def menu
-    persistent_config[:menu] ||= config[:menu] == false ? nil : config[:menu] # || [{:text => 'Button', :menu => ['edit', {:text => 'Submenu', :menu => ['delete']}]}]
+  def js_config
+    super.deep_merge({
+      :loader => {:data_url => id_name+"__get_children".l}
+    })
   end
   
   def get_children(params)
     klass = config[:data_class_name].constantize
     node = params[:node] == 'source' ? klass.find_by_parent_id(nil) : klass.find(params[:node].to_i)
-    node.children.map{|n| {:text => n.name, :id => n.id}}
+    node.children.map{|n| {:text => n.name, :id => n.id, :leaf => n.children.empty?}}
   end
 end

data/stylesheets/basepack.css

@@ -23,4 +23,9 @@ left: -24px;
 /* highilght new records in grid */
 .grid-dirty-record {
   background: #fdd;
+}
+
+/* StatusBar - fixing forgotten "!important" */
+.x-statusbar .x-status-busy {
+    padding-left: 25px !important;
 }

data/test/unit/helper_model_test.rb

@@ -6,10 +6,10 @@ class HelperModelTest < ActiveSupport::TestCase
   
   test "reading/writing values" do
     Netzke::FormPanel.config.deep_merge!({
+      :persistent_config => true,
       :ext_config => {
         :enable_config_tool => true
       },
-      :persistent_config => true
     })
     form = Netzke::FormPanel.new(:data_class_name => "Book")
     Netzke::PropertyEditorExtras::HelperModel.widget = form

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-basepack
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-24 00:00:00 -05:00
+date: 2009-10-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - lib/netzke/active_record/basepack.rb
 - lib/netzke/active_record/data_accessor.rb
 - lib/netzke/basic_app.rb
+- lib/netzke/basic_app_extras/statusbar_ext.js
 - lib/netzke/border_layout_panel.rb
 - lib/netzke/configuration_panel.rb
 - lib/netzke/data_accessor.rb
@@ -72,7 +73,6 @@ files:
 - lib/netzke/form_panel_js.rb
 - lib/netzke/grid_panel.rb
 - lib/netzke/grid_panel_api.rb
-- lib/netzke/grid_panel_extras/javascripts/check-column.js
 - lib/netzke/grid_panel_extras/javascripts/filters.js
 - lib/netzke/grid_panel_extras/javascripts/rows-dd.js
 - lib/netzke/grid_panel_js.rb
@@ -86,7 +86,6 @@ files:
 - lib/netzke/table_editor.rb
 - lib/netzke/tree_panel.rb
 - lib/netzke/wrapper.rb
-- netzke-basepack.gemspec
 - stylesheets/basepack.css
 - tasks/netzke_basepack_tasks.rake
 - test/app_root/app/controllers/application.rb

data/lib/netzke/grid_panel_extras/javascripts/check-column.js

@@ -1,33 +0,0 @@
-// 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/netzke-basepack.gemspec

@@ -1,170 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{netzke-basepack}
-  s.version = "0.5.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sergei Kozlov"]
-  s.date = %q{2009-09-24}
-  s.description = %q{Pre-built Netzke widgets for your RIA}
-  s.email = %q{sergei@playcode.nl}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".autotest",
-     ".gitignore",
-     "CHANGELOG.rdoc",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "TODO.rdoc",
-     "VERSION",
-     "autotest/discover.rb",
-     "init.rb",
-     "install.rb",
-     "javascripts/basepack.js",
-     "lib/app/models/netzke_auto_column.rb",
-     "lib/netzke-basepack.rb",
-     "lib/netzke/accordion_panel.rb",
-     "lib/netzke/active_record/basepack.rb",
-     "lib/netzke/active_record/data_accessor.rb",
-     "lib/netzke/basic_app.rb",
-     "lib/netzke/border_layout_panel.rb",
-     "lib/netzke/configuration_panel.rb",
-     "lib/netzke/data_accessor.rb",
-     "lib/netzke/ext.rb",
-     "lib/netzke/field_model.rb",
-     "lib/netzke/fields_configurator.rb",
-     "lib/netzke/form_panel.rb",
-     "lib/netzke/form_panel_api.rb",
-     "lib/netzke/form_panel_extras/javascripts/xcheckbox.js",
-     "lib/netzke/form_panel_js.rb",
-     "lib/netzke/grid_panel.rb",
-     "lib/netzke/grid_panel_api.rb",
-     "lib/netzke/grid_panel_extras/javascripts/check-column.js",
-     "lib/netzke/grid_panel_extras/javascripts/filters.js",
-     "lib/netzke/grid_panel_extras/javascripts/rows-dd.js",
-     "lib/netzke/grid_panel_js.rb",
-     "lib/netzke/masquerade_selector.rb",
-     "lib/netzke/panel.rb",
-     "lib/netzke/plugins/configuration_tool.rb",
-     "lib/netzke/property_editor.rb",
-     "lib/netzke/property_editor_extras/helper_model.rb",
-     "lib/netzke/search_panel.rb",
-     "lib/netzke/tab_panel.rb",
-     "lib/netzke/table_editor.rb",
-     "lib/netzke/tree_panel.rb",
-     "lib/netzke/wrapper.rb",
-     "netzke-basepack.gemspec",
-     "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",
-     "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/script/console",
-     "test/app_root/vendor/plugins/acts_as_list/README",
-     "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/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/schema.rb",
-     "test/test_helper.rb",
-     "test/unit/accordion_panel_test.rb",
-     "test/unit/active_record_basepack_test.rb",
-     "test/unit/grid_panel_test.rb",
-     "test/unit/helper_model_test.rb",
-     "test/unit/netzke_basepack_test.rb",
-     "test/unit/tab_panel_test.rb",
-     "uninstall.rb"
-  ]
-  s.homepage = %q{http://github.com/skozlov/netzke-basepack}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{netzke-basepack}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Pre-built Netzke widgets for your RIA}
-  s.test_files = [
-    "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/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/vendor/plugins/acts_as_list/init.rb",
-     "test/app_root/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb",
-     "test/console_with_fixtures.rb",
-     "test/schema.rb",
-     "test/test_helper.rb",
-     "test/unit/accordion_panel_test.rb",
-     "test/unit/active_record_basepack_test.rb",
-     "test/unit/grid_panel_test.rb",
-     "test/unit/helper_model_test.rb",
-     "test/unit/netzke_basepack_test.rb",
-     "test/unit/tab_panel_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<netzke-core>, [">= 0.4.3"])
-      s.add_runtime_dependency(%q<searchlogic>, [">= 2.0.0"])
-    else
-      s.add_dependency(%q<netzke-core>, [">= 0.4.3"])
-      s.add_dependency(%q<searchlogic>, [">= 2.0.0"])
-    end
-  else
-    s.add_dependency(%q<netzke-core>, [">= 0.4.3"])
-    s.add_dependency(%q<searchlogic>, [">= 2.0.0"])
-  end
-end