netzke-basepack 0.5.5.1 → 0.5.6

data/lib/netzke/grid_panel/record_form_window.rb

@@ -0,0 +1,44 @@
+module Netzke
+  class GridPanel < Base
+    class RecordFormWindow < Window
+      def initial_config
+        super.deep_merge({
+          :ext_config => {
+            :modal => true,
+            :width => "60%",
+            :height => "90%",
+            :fbar => [:ok, :cancel]
+          }
+        })
+      end
+    
+      def self.js_extend_properties
+        {
+          :button_align => "right",
+        
+          :init_component => <<-END_OF_JAVASCRIPT.l,
+            function(){
+              #{js_full_class_name}.superclass.initComponent.call(this);
+              this.getWidget().on("submitsuccess", function(){this.closeRes = "ok"; this.close();}, this);
+            }
+          END_OF_JAVASCRIPT
+        
+          :on_ok => <<-END_OF_JAVASCRIPT.l,
+            function(){
+              this.getWidget().onApply();
+              // this.closeRes = "ok",
+              // this.close();
+            }
+          END_OF_JAVASCRIPT
+        
+          :on_cancel => <<-END_OF_JAVASCRIPT.l,
+            function(){
+              this.close();
+            }
+          END_OF_JAVASCRIPT
+        
+        }
+      end
+    end
+  end
+end

data/lib/netzke/panel.rb

@@ -1,5 +1,4 @@
-module Netzke
-  class Panel < Base
+class Netzke::Panel < Netzke::Base
     def self.js_extend_properties
       {
         :update_body_html => <<-END_OF_JAVASCRIPT.l,
@@ -9,5 +8,4 @@ module Netzke
         END_OF_JAVASCRIPT
       }
     end
-  end
 end

data/lib/netzke/property_editor.rb

@@ -1,3 +1,5 @@
+require "netzke/property_editor/helper_model"
+
 module Netzke
   class PropertyEditor < FormPanel
     

data/lib/netzke/{property_editor_extras → property_editor}/helper_model.rb

@@ -1,12 +1,12 @@
 module Netzke
-  module PropertyEditorExtras 
+  class PropertyEditor < FormPanel
     class HelperModel
       def self.widget=(w)
         @@widget = w
       end
       
       def self.widget
-        @@widget ||= raise RuntimeError, "No widget specified for PropertyEditorExtras::HelperModel"
+        @@widget ||= raise RuntimeError, "No widget specified for PropertyEditor::HelperModel"
       end
       
       def self.reflect_on_all_associations

data/lib/netzke/search_panel.rb

@@ -4,8 +4,8 @@ module Netzke
   # FormPanel-based widget that allows create configurable searchlogic-compatible searches. 
   # Pretty much work in progress.
   class SearchPanel < FormPanel
-    # Something like [:equals, :greater_than_or_equal_to, :does_not_equal, :less_than, :less_than_or_equal_to, :greater_than, :ends_with, :like, :begins_with, :empty, :null]
-    CONDITIONS = [:COMPARISON_CONDITIONS, :WILDCARD_CONDITIONS, :BOOLEAN_CONDITIONS].inject([]){|r, c| r + Searchlogic::NamedScopes::Conditions.const_get(c).keys}
+    
+    CONDITIONS = [:COMPARISON_CONDITIONS, :WILDCARD_CONDITIONS, :BOOLEAN_CONDITIONS].inject([]){|r, c| r + Searchlogic::NamedScopes::Conditions.const_get(c).keys} # Something like [:equals, :greater_than_or_equal_to, :does_not_equal, :less_than, :less_than_or_equal_to, :greater_than, :ends_with, :like, :begins_with, :empty, :null]
     
     def default_config
       super.merge({
@@ -21,7 +21,7 @@ module Netzke
         norm_column.merge!({
           :condition => "equals"
         })
-        norm_column.merge!(:hidden => true) if norm_column[:name].to_s.index("__")
+        norm_column.merge!(:hidden => true) if norm_column[:name].to_s.index("__") || norm_column[:xtype] == :xcheckbox
         
         norm_column
       end

data/lib/netzke/window.rb

@@ -18,13 +18,16 @@ module Netzke
     
     # Set the passed item as the only aggregatee
     def initial_aggregatees
-      {:item => config[:item]}
+      res = {}
+      res.merge!(:item => config[:item]) if config[:item]
+      res
     end
     
     # Extends the JavaScript class
     def self.js_extend_properties
       {
         :layout => "fit",
+        
         :init_component => <<-END_OF_JAVASCRIPT.l,
           function(){
             // Width and height may be specified as percentage of available space, e.g. "60%".
@@ -41,9 +44,12 @@ module Netzke
             // Set the move and resize events after window is shown, so that they don't fire at initial rendering
             this.on("show", function(){
               this.on("move", this.onMove, this);
-              this.on("resize", this.onSelfResize, this, {buffer: 50}); // Work around firing "resize" event twice (currently a bug in ExtJS)
+              this.on("resize", this.onSelfResize, this); // Work around firing "resize" event twice (currently a bug in ExtJS)
             }, this);
-            this.instantiateChild(this.itemConfig);
+
+            if (this.itemConfig){
+              this.instantiateChild(this.itemConfig);
+            }
           }
         END_OF_JAVASCRIPT
       

data/test/unit/grid_panel_test.rb

@@ -1,8 +1,6 @@
 require 'test_helper'
 require 'netzke-core'
 
-module Netzke::GridPanelExtras; end
-
 require 'netzke/plugins/configuration_tool'
 require 'netzke/accordion_panel'
 

data/test/unit/helper_model_test.rb

@@ -12,8 +12,8 @@ class HelperModelTest < ActiveSupport::TestCase
       },
     })
     form = Netzke::FormPanel.new(:data_class_name => "Book")
-    Netzke::PropertyEditorExtras::HelperModel.widget = form
-    helper_model = Netzke::PropertyEditorExtras::HelperModel.new
+    Netzke::PropertyEditor::HelperModel.widget = form
+    helper_model = Netzke::PropertyEditor::HelperModel.new
     
     assert(true, helper_model.ext_config__config_tool)
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-basepack
 version: !ruby/object:Gem::Version 
-  version: 0.5.5.1
+  version: 0.5.6
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 -06:00
+date: 2010-01-21 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.5.2
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: searchlogic
@@ -64,34 +64,35 @@ files:
 - install.rb
 - javascripts/basepack.js
 - lib/app/models/netzke_auto_column.rb
+- lib/app/models/netzke_auto_field.rb
+- lib/app/models/netzke_auto_table.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/basic_app_extras/statusbar_ext.js
+- lib/netzke/basic_app/statusbar_ext.js
 - 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/netzkefileupload.js
-- lib/netzke/form_panel_extras/javascripts/xcheckbox.js
-- lib/netzke/form_panel_js.rb
+- lib/netzke/form_panel/form_panel_api.rb
+- lib/netzke/form_panel/form_panel_js.rb
+- lib/netzke/form_panel/javascripts/netzkefileupload.js
+- lib/netzke/form_panel/javascripts/xcheckbox.js
 - lib/netzke/grid_panel.rb
-- lib/netzke/grid_panel_api.rb
-- lib/netzke/grid_panel_extras/javascripts/filters.js
-- lib/netzke/grid_panel_extras/javascripts/rows-dd.js
-- lib/netzke/grid_panel_extras/record_form_window.rb
-- lib/netzke/grid_panel_js.rb
+- lib/netzke/grid_panel/grid_panel_api.rb
+- lib/netzke/grid_panel/grid_panel_js.rb
+- lib/netzke/grid_panel/javascripts/filters.js
+- lib/netzke/grid_panel/javascripts/rows-dd.js
+- lib/netzke/grid_panel/record_form_window.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/property_editor/helper_model.rb
 - lib/netzke/search_panel.rb
 - lib/netzke/tab_panel.rb
 - lib/netzke/table_editor.rb

data/lib/netzke/field_model.rb

@@ -1,131 +0,0 @@
-module Netzke
-  class FieldModel < Hash
-    include BasepackActiveRecord
-    
-    def self.new_from_hash(hsh)
-      self.new.replace(hsh)
-    end
-    
-    # def self.json=(str)
-    #   @@data = ActiveSupport::JSON.decode(str)
-    #   process_data
-    # end
-
-    def self.widget_name=(w)
-      @@widget_name = w
-    end
-
-    def self.data_storage=(ds)
-      @@storage = ds
-      process_data
-    end
-
-    # def self.data=(data)
-    #   @@raw_data = data
-    #   process_data
-    # end
-    
-    def self.column_names
-      @@data.inject([]){|res, record| (res + record.keys).uniq}
-    end
-    
-    def self.columns
-      column_names
-    end
-    
-    def self.all(params={})
-      @@data
-    end
-    
-    def self.first
-      @@data[0]
-    end
-    
-    def self.find(id)
-      @@data[id-1]
-    end
-    
-    def self.count(params = {})
-      @@data.size
-    end
-    
-    def self.columns_hash
-      @@columns_hash
-    end
-    
-    def self.reflect_on_all_associations
-      []
-    end
-    
-    # instance methods
-    def id
-      self[:id] || self["id"]
-    end
-    
-    def errors
-      []
-    end
-    
-    def save
-      true
-    end
-    
-    private
-    def self.process_data
-      @@columns_hash = {}
-
-      @@data = []
-      
-      # convert array of hashes into array of FieldModel instances
-      @@storage.each do |hsh|
-        @@data << new_from_hash(hsh)
-      end
-
-      @@data.each do |record|
-        record.keys.each do |k|
-          
-          if @@columns_hash[k.to_s].nil?
-            
-            # calculate column type
-            puts record[k].class.to_s
-            column_type = case record[k].class.to_s
-              when "TrueClass"
-                :boolean
-              when "FalseClass"
-                :boolean
-              when "String"
-                :string
-              when "Fixnum"
-                :integer
-              else
-                :string
-              end
-            
-            column = {:type => column_type}
-
-            # workaround for the "type" method
-            class << column
-              def type
-                self[:type]
-              end
-            end
-
-            @@columns_hash[k.to_s] = column
-          end
-        end
-      end
-    end
-
-    # # Testing
-    # @@data = [
-    #   self.new_from_hash({"id" => 1, "name" => "col1", "column_type" => "text", "read_only" => true}),
-    #   self.new_from_hash({"id" => 2, "name" => "col2", "column_type" => "string", "read_only" => false})
-    # ]
-    # 
-    # process_data
-    # end testing
-
-  end
-  
-  
-end

data/lib/netzke/form_panel_api.rb

@@ -1,78 +0,0 @@
-module Netzke
-  module FormPanelApi
-    # API handling form submission
-    def netzke_submit(params)
-      success = create_or_update_record(params)
-
-      if success
-        {:set_form_values => array_of_values, :set_result => "ok"}
-      else
-        # flash eventual errors
-        @record.errors.each_full do |msg|
-          flash :error => msg
-        end
-        {:feedback => @flash}
-      end
-    end
-
-    # Creates/updates a record from hash
-    def create_or_update_record(params)
-      hsh = ActiveSupport::JSON.decode(params[:data])
-      hsh.merge!(config[:strong_default_attrs]) if config[:strong_default_attrs]
-      klass = config[:data_class_name].constantize
-      @record ||= klass.find_by_id(hsh.delete("id")) # only pick up the record specified in the params if it was not provided in the configuration
-      success = true
-
-      @record = klass.new if @record.nil?
-
-      hsh.each_pair do |k,v|
-        begin
-          @record.send("#{k}=",v)
-        rescue StandardError => exc
-          logger.debug "!!! FormPanelApi#create_or_update_record exception: #{exc.inspect}\n"
-          flash :error => exc.message
-          success = false
-          break
-        end
-      end
-      
-      # did we have complete success?
-      success && @record.save
-    end
-
-    # API handling form load
-    # def load(params)
-    #   klass = config[:data_class_name].constantize
-    #   case params[:neighbour]
-    #     when "previous" then @record = klass.previous(params[:id])
-    #     when "next"     then @record = klass.next(params[:id])
-    #     else                 @record = klass.find(params[:id])
-    #   end
-    #   {:data => [array_of_values]}
-    # end
-    
-    def netzke_load(params)
-      @record = data_class && data_class.find_by_id(params[:id])
-      {:set_form_values => array_of_values}
-    end
-    
-    # API that returns options for a combobox
-    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
-    
-    def configuration_panel__fields__get_combobox_options(params)
-      query = params[:query]
-      {:data => (predefined_columns.map{ |c| c[:name].to_s }).grep(/^#{query}/).map{ |n| [n] }}.to_nifty_json
-    end
-    
-    # Returns array of form values according to the configured columns
-    def array_of_values
-      @record && @record.to_array(columns, self)
-    end
-    
-  end
-end