netzke-basepack 0.5.1 → 0.5.2

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+v0.5.2 - 2009-09-24
+Fix: combobox options for association columns didn't work properly.
+Fix: GridPanel's multi-edit functionality didn't work.
+Fix: gem dependencies are now correct.
+
 v0.5.1 - 2009-09-11
 Fix: crash when FormPanel has no data_class_name specified.
 New: DataAccessor widgets (Form/GridPanel) now let the underlying model know which widget (i.e. which instance) accesses its data. Can be useful in virtual attributes for generating widget-specific HTML.

data/Rakefile

@@ -8,8 +8,8 @@ begin
     gemspec.homepage = "http://github.com/skozlov/netzke-basepack"
     gemspec.rubyforge_project = "netzke-basepack"
     gemspec.authors = ["Sergei Kozlov"]
-    gemspec.add_dependency "netzke-core"
-    gemspec.add_dependency "searchlogic"
+    gemspec.add_dependency("netzke-core", ">=0.4.3")
+    gemspec.add_dependency("searchlogic", ">=2.0.0")
   end
   Jeweler::RubyforgeTasks.new do |rubyforge|
     rubyforge.doc_task = "rdoc"

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/netzke/active_record/basepack.rb

@@ -62,7 +62,7 @@ module Netzke::ActiveRecord
 
     module ClassMethods
 
-      def options_for(column, query = nil)
+      def options_for(column, query = "")
         # First, check if we have options for this class and column defined in persistent storage
         NetzkePreference.widget_name = self.name
         options = NetzkePreference[:combobox_options] || {}
@@ -82,12 +82,12 @@ module Netzke::ActiveRecord
             column = assoc_name
             if self.column_names.include?(column)
               # it's simply a column in the table
-              records = query.nil? ? find_by_sql("select distinct #{column} from #{table_name}") : find_by_sql("select distinct #{column} from #{table_name} where #{column} like '#{query}%'")
+              records = query.empty? ? find_by_sql("select distinct #{column} from #{table_name}") : find_by_sql("select distinct #{column} from #{table_name} where #{column} like '#{query}%'")
               records.map{|r| r.send(column)}
             else
               # it's a "virtual" column - the least effective search
               records = self.find(:all).map{|r| r.send(column)}.uniq
-              query.nil? ? records : records.select{|r| r.index(/^#{query}/)}
+              query.empty? ? records : records.select{|r| r.index(/^#{query}/)}
             end
           end
         end

data/lib/netzke/grid_panel_api.rb

@@ -69,7 +69,6 @@ module Netzke
     def get_combobox_options(params)
       column = params[:column]
       query = params[:query]
-  
       {:data => config[:data_class_name].constantize.options_for(column, query).map{|s| [s]}}
     end
 
@@ -227,11 +226,11 @@ module Netzke
 
     # When providing the edit_form aggregatee, fill in the form with the requested record
     def load_aggregatee_with_cache(params)
-      if params[:id] == 'edit_form'
-        super(params.merge(:config => {:record_id => params[:record_id]}.to_json))
-      else
-        super
+      if params[:id] == 'editForm'
+        aggregatees[:edit_form].merge!(:record_id => params[:record_id])
       end
+      
+      super
     end
     
     # Search scopes, in searchlogic format
@@ -347,6 +346,5 @@ module Netzke
       res.to_nifty_json
     end
     
-    
   end
 end

data/lib/netzke/grid_panel_js.rb

@@ -581,12 +581,14 @@ module Netzke
               this.editFormWindow.show(null, function(){
                 var selModel = this.getSelectionModel();
                 if (selModel.getCount() > 1) {
-                  this.editFormWindow.setTitle('Multi-edit');
+
                   // multiedit
+                  this.editFormWindow.setTitle('Multi-edit');
                   this.loadAggregatee({
-                    id: "multi_edit_form",
+                    id: "multiEditForm",
                     container: this.editFormWindow.id,
                     callback: function(aggr){
+                      // on apply attach ids of selected rows
                       aggr.on('apply', function(){
                         var ids = [];
                         selModel.each(function(r){
@@ -598,14 +600,16 @@ module Netzke
                     scope: this
                   });
                 } else {
+                  
                   // single edit
                   this.editFormWindow.setTitle('Edit');
                   var recordId = selModel.getSelected().get('id');
                   this.loadAggregatee({
-                    id: "edit_form",
+                    id: "editForm",
                     container: this.editFormWindow.id,
-                    scope: this,
-                    record_id: recordId
+                    params: {
+                      record_id: recordId
+                    }
                   });
                 }
               }, this);
@@ -640,7 +644,7 @@ module Netzke
               this.formWindow.show(null, function(){
                 this.formWindow.closeRes = 'cancel';
                 if (!this.formWindow.getWidget()){
-                  this.loadAggregatee({id:"new_record_form", container:this.formWindow.id});
+                  this.loadAggregatee({id:"newRecordForm", container:this.formWindow.id});
                 }
               }, this);
 
@@ -704,7 +708,7 @@ module Netzke
               this.searchWindow.show(null, function(){
                 this.searchWindow.closeRes = 'cancel';
                 if (!this.searchWindow.getWidget()){
-                  this.loadAggregatee({id:"search_panel", container:this.searchWindow.id});
+                  this.loadAggregatee({id:"searchPanel", container:this.searchWindow.id});
                 }
               }, this);
 

data/netzke-basepack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{netzke-basepack}
-  s.version = "0.5.1"
+  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-11}
+  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 = [
@@ -113,7 +113,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{netzke-basepack}
-  s.rubygems_version = %q{1.3.4}
+  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",
@@ -157,14 +157,14 @@ Gem::Specification.new do |s|
     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"])
-      s.add_runtime_dependency(%q<searchlogic>, [">= 0"])
+      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"])
-      s.add_dependency(%q<searchlogic>, [">= 0"])
+      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"])
-    s.add_dependency(%q<searchlogic>, [">= 0"])
+    s.add_dependency(%q<netzke-core>, [">= 0.4.3"])
+    s.add_dependency(%q<searchlogic>, [">= 2.0.0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-basepack
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 -05:00
+date: 2009-09-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.4.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: searchlogic
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.0.0
     version: 
 description: Pre-built Netzke widgets for your RIA
 email: sergei@playcode.nl
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: netzke-basepack
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Pre-built Netzke widgets for your RIA