netzke-basepack 0.5.5.1 → 0.5.6

data/lib/netzke/active_record/basepack.rb

@@ -1,3 +1,5 @@
+require "activerecord"
+
 module Netzke::ActiveRecord
   # Provides extensions to all ActiveRecord-based classes
   module Basepack
@@ -59,6 +61,32 @@ module Netzke::ActiveRecord
         super
       end
     end
+    
+    # Make respond_to? return true for association assignment method, like "genre__name="
+    def respond_to?(method, include_private = false)
+      split = method.to_s.split(/__/)
+      if split.size > 1
+        if split.last =~ /=$/ 
+          if split.size == 2
+            # search for association and assign it to self
+            assoc = self.class.reflect_on_association(split.first.to_sym)
+            assoc_method = split.last.chop
+            if assoc
+              assoc.klass.respond_to?("find_by_#{assoc_method}")
+            else
+              super
+            end
+          else
+            super
+          end
+        else
+          # self.respond_to?(split.first) ? self.send(split.first).respond_to?(split[1..-1].join("__")) : false
+          super
+        end
+      else
+        super
+      end
+    end
 
     module ClassMethods
 

data/lib/netzke/active_record/data_accessor.rb

@@ -1,3 +1,5 @@
+require 'netzke/active_record/basepack'
+
 module Netzke::ActiveRecord
   # Provides extensions to those ActiveRecord-based models that provide data to the "data accessor" widgets,
   # like GridPanel, FormPanel, etc

data/lib/netzke/basic_app.rb

@@ -14,8 +14,8 @@ module Netzke
     def self.include_js
       res = []
       ext_examples = Netzke::Base.config[:ext_location] + "/examples/"
-      res << ext_examples + "ux/StatusBar.js"
-      res << "#{File.dirname(__FILE__)}/basic_app_extras/statusbar_ext.js"
+      res << ext_examples + "ux/statusbar/StatusBar.js"
+      res << "#{File.dirname(__FILE__)}/basic_app/statusbar_ext.js"
     end
 
     def self.js_base_class
@@ -57,7 +57,6 @@ module Netzke
         :xtype => 'toolbar',
         :region => 'north',
         :height => 25
-        # :items => ["-"]
       },{
         :id => 'main-statusbar',
         :xtype => 'statusbar',
@@ -115,10 +114,10 @@ module Netzke
               // var position = toolbar.items.getCount() - 2;
               // position = position < 0 ? 0 : position;
               // toolbar.insertButton(position, newMenu);
-
               toolbar.add(item);
               // this.menus[owner.id].push(newMenu); // TODO: remember the menus from this owner in some other way
           	}, this);
+          	toolbar.doLayout(); // required since Ext 3.0.3
         	}
         END_OF_JAVASCRIPT
 

data/lib/netzke/data_accessor.rb

@@ -1,3 +1,5 @@
+require "netzke/active_record/data_accessor"
+
 module Netzke
   # This module is included into such data-driven widgets as GridPanel, FormPanel, etc. It provides for
   # flexible pre-configuration of (virtual) attributes.

data/lib/netzke/ext.rb

@@ -1,7 +1,7 @@
 module Netzke
   # Ext-related module. Some constants provide meta-information about the Ext.library.
   module Ext
-    FORM_FIELD_XTYPES = %w{ textfield numberfield textarea combobox checkbox xdatetime }
+    FORM_FIELD_XTYPES = %w{ textfield numberfield textarea combobox xcheckbox checkbox xdatetime }
     COLUMN_XTYPES = %w{ gridcolumn booleancolumn numbercolumn datecolumn }
   end
 end

data/lib/netzke/fields_configurator.rb

@@ -8,13 +8,24 @@ module Netzke
 
     def initialize(*args)
       super
-      NetzkeAutoColumn.widget = config[:widget]
+      @auto_table_klass = is_for_grid? ? NetzkeAutoColumn : NetzkeAutoField
+      @auto_table_klass.widget = client_widget
+    end
+
+    # widget that uses us
+    def client_widget
+      @passed_config[:widget]
+    end
+
+    # is our client widget a grid (as opposed to a form)?
+    def is_for_grid?
+      client_widget.class.ancestors.include?(GridPanel)
     end
 
     def default_config
       super.deep_merge({
         :name              => 'columns',
-        :data_class_name   => "NetzkeAutoColumn",
+        :data_class_name   => is_for_grid? ? "NetzkeAutoColumn" : "NetzkeAutoField",
         :ext_config        => {
           :header => false,
           :enable_extended_search => false,
@@ -32,7 +43,7 @@ module Netzke
     end
     
     def default_bbar
-      %w{ edit apply - defaults }
+      %w{ add edit apply del - defaults }
     end
         
     def predefined_columns
@@ -69,13 +80,13 @@ module Netzke
     
     def load_defaults(params)
       config[:widget].persistent_config[:layout__columns] = config[:widget].default_columns
-      NetzkeAutoColumn.rebuild_table
+      @auto_table_klass.rebuild_table
       {:load_store_data => get_data}
     end
    
     def commit(params)
       defaults_hash = config[:widget].class.config_columns.inject({}){ |r, c| r.merge!(c[:name] => c[:default]) }
-      config[:widget].persistent_config[:layout__columns] = NetzkeAutoColumn.all_columns.map do |c| 
+      config[:widget].persistent_config[:layout__columns] = @auto_table_klass.all_columns.map do |c| 
         # reject all keys that are 1) same as defaults, 2) 'position'
         c.reject!{ |k,v| defaults_hash[k.to_sym].to_s == v.to_s || k == 'position'} 
         c = c["name"] if c.keys.count == 1 # denormalize the column
@@ -86,7 +97,12 @@ module Netzke
    
     # each time that we are loaded into the app, rebuild the table
     def before_load
-      NetzkeAutoColumn.rebuild_table
+      @auto_table_klass.rebuild_table
+    end
+   
+    # Don't show the config tool
+    def config_tool_needed?
+      false
     end
    
   end

data/lib/netzke/form_panel.rb

@@ -1,10 +1,15 @@
+require "netzke/form_panel/form_panel_js"
+require "netzke/form_panel/form_panel_api"
+require "netzke/plugins/configuration_tool"
+require "netzke/data_accessor"
+
 module Netzke
   # = FormPanel
   # 
   # Represents Ext.form.FormPanel
   # 
   # == Configuration
-  # * <tt>:data_class_name</tt> - name of the ActiveRecord model that provides data to this GridPanel.
+  # * <tt>:model</tt> - name of the ActiveRecord model that provides data to this GridPanel.
   # * <tt>:record</tt> - record to be displayd in the form. Takes precedence over <tt>:record_id</tt>
   # * <tt>:record_id</tt> - id of the record to be displayd in the form. Also see <tt>:record</tt>
   # 
@@ -12,8 +17,8 @@ module Netzke
   # 
   # * <tt>:mode</tt> - when set to <tt>:config</tt>, FormPanel loads in configuration mode
   class FormPanel < Base
-    include Netzke::FormPanelJs  # javascript (client-side)
-    include Netzke::FormPanelApi # API (server-side)
+    include FormPanelJs  # javascript (client-side)
+    include FormPanelApi # API (server-side)
     include Netzke::DataAccessor # some code shared between GridPanel, FormPanel, and other widgets that use database attributes
 
     # Class-level configuration with defaults
@@ -43,9 +48,9 @@ module Netzke
     # Extra javascripts
     def self.include_js
       [
-        "#{File.dirname(__FILE__)}/form_panel_extras/javascripts/xcheckbox.js",
-        Netzke::Base.config[:ext_location] + "/examples/ux/FileUploadField.js",
-        "#{File.dirname(__FILE__)}/form_panel_extras/javascripts/netzkefileupload.js"
+        "#{File.dirname(__FILE__)}/form_panel/javascripts/xcheckbox.js",
+        Netzke::Base.config[:ext_location] + "/examples/ux/fileuploadfield/FileUploadField.js",
+        "#{File.dirname(__FILE__)}/form_panel/javascripts/netzkefileupload.js"
       ]
     end
     
@@ -56,11 +61,14 @@ module Netzke
     def initialize(*args)
       super
       apply_helpers
-      @record = config[:record] || data_class && data_class.find_by_id(config[:record_id])
+      @record = config[:record] || config[:record_id] && data_class && data_class.find(:first, :conditions  => {data_class.primary_key => config[:record_id]})
     end
     
+    # (We can't memoize this method because at some point we extend it, e.g. in Netzke::DataAccessor)
     def data_class
-      @data_class ||= config[:data_class_name] && config[:data_class_name].constantize
+      ::ActiveSupport::Deprecation.warn("data_class_name option is deprecated. Use model instead", caller) if config[:data_class_name]
+      model_name = config[:model] || config[:data_class_name]
+      @data_class ||= model_name && model_name.constantize
     end
     
     def configuration_widgets
@@ -98,7 +106,8 @@ module Netzke
     def js_config
       res = super
       res.merge!(:clmns => columns)
-      res.merge!(:data_class_name => config[:data_class_name])
+      res.merge!(:data_class_name => data_class.name) if data_class
+      res.merge!(:pri => data_class.primary_key) if data_class
       res
     end
  
@@ -108,10 +117,10 @@ module Netzke
         {:name => :name, :type => :string, :editor => :combobox, :width => 200},
         {:name => :hidden, :type => :boolean, :editor => :checkbox, :width => 40, :header => "Excl"},
         {:name => :disabled, :type => :boolean, :editor => :checkbox, :width => 40, :header => "Dis"},
-        {:name => :xtype, :type => :string},
+        {:name => :xtype, :type => :string, :editor => {:xtype => :combobox, :options => Netzke::Ext::FORM_FIELD_XTYPES}},
         {:name => :value, :type => :string},
         {:name => :field_label, :type => :string},
-        {:name => :input_type, :type => :string}
+        {:name => :input_type, :type => :string, :hidden => true}
       ]
     end
  

data/lib/netzke/form_panel/form_panel_api.rb

@@ -0,0 +1,78 @@
+module Netzke
+  class FormPanel < Base
+    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]
+        @record ||= data_class.find(:first, :conditions => {data_class.primary_key => hsh.delete(data_class.primary_key)}) # only pick up the record specified in the params if it was not provided in the configuration
+        success = true
+
+        @record = data_class.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 => data_class.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
+end

data/lib/netzke/form_panel/form_panel_js.rb

@@ -0,0 +1,143 @@
+module Netzke
+  class FormPanel < Base
+    module FormPanelJs
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        def js_base_class
+          "Ext.FormPanel"
+        end
+
+        def js_extend_properties
+          {
+            :body_style     => 'padding:5px 5px 0',
+            :auto_scroll    => true,
+            :label_width    => 150,
+            :default_type   => 'textfield',
+
+            :init_component => <<-END_OF_JAVASCRIPT.l,
+              function(){
+                var recordFields = []; // Record
+                this.items = [];
+                var index = 0;
+            
+                // Process columns
+                Ext.each(this.clmns, function(field){
+                  if (typeof field == 'string') field = {name:field}; // normalize field
+                  if (!field.hidden || field.name == this.pri) {
+                    recordFields.push({name:field.name, mapping:index++});
+
+                    var defaultColumnConfig = Ext.apply({}, this.defaultColumnConfig);
+                    var columnConfig = Ext.apply(defaultColumnConfig, field);
+
+                    // apply dynamically defined properties
+                    Ext.apply(columnConfig, {
+                      fieldLabel: columnConfig.fieldLabel || columnConfig.name.humanize(),
+                      hideLabel: columnConfig.hidden, // completely hide fields marked "hidden"
+                      parentId: this.id,
+                      name: columnConfig.name,
+                      checked: columnConfig.xtype == "xcheckbox" ? columnConfig.value : null // checkbox state
+                    });
+
+                    this.items.push(columnConfig);
+                  }
+                }, this);
+            
+                var Record = Ext.data.Record.create(recordFields);
+                this.reader = new Ext.data.RecordArrayReader({root:"data"}, Record);
+            
+                delete this.clmns; // we don't need them anymore
+            
+                // Now let Ext.form.FormPanel do the rest
+                #{js_full_class_name}.superclass.initComponent.call(this);
+            
+                // Apply event
+                this.addEvents('apply');
+              }
+            END_OF_JAVASCRIPT
+
+            # Defaults for each field
+            :defaults       => {
+              :anchor       => '-20', # to leave some space for the scrollbar
+              # :width => 180, # we do NOT want fixed size because it doesn't look nice when resizing
+              :listeners    => {
+                # On "return" key, submit the form
+        				:specialkey => {
+        				  :fn => <<-END_OF_JAVASCRIPT.l
+          				  function(field, event){
+            					if (event.getKey() == 13) this.ownerCt.onApply();
+            				}
+        				  END_OF_JAVASCRIPT
+      				  }
+              }
+            },
+        
+            :default_column_config => config_columns.inject({}){ |r, c| r.merge!({
+              c[:name] => c[:default]
+            }) },
+        
+            :set_form_values => <<-END_OF_JAVASCRIPT.l,
+              function(values){
+                this.form.loadRecord(this.reader.readRecords({data:[values]}).records[0]);
+              }
+            END_OF_JAVASCRIPT
+
+            :load_record => <<-END_OF_JAVASCRIPT.l,
+              function(id, neighbour){
+                this.netzkeLoad({id:id});
+              }
+            END_OF_JAVASCRIPT
+        
+            # :previous => <<-END_OF_JAVASCRIPT.l,
+            #   function() {
+            #     var currentId = this.form.getValues().id;
+            #     this.loadRecord(currentId, 'previous');
+            #   }
+            # END_OF_JAVASCRIPT
+            # 
+            # :next => <<-END_OF_JAVASCRIPT.l,
+            #   function() {
+            #     var currentId = this.form.getValues().id;
+            #     this.loadRecord(currentId, 'next');
+            #   }
+            # END_OF_JAVASCRIPT
+        
+            :on_apply => <<-END_OF_JAVASCRIPT.l
+              function() {
+                if (this.fireEvent('apply', this)) {
+                  var values = this.getForm().getValues();
+                  for (var k in values) {
+                    if (values[k] == "") {delete values[k]}
+                  }
+                  if (this.fileUpload) {
+                    // Not a Netzke's standard API call, because the form is multipart
+                    this.getForm().submit({
+                      url: this.buildApiUrl("netzke_submit"),
+                      params: {
+                        data: Ext.encode(values)
+                      },
+                      failure: function(form, action){
+                        // It will always be failure, as we don't play along with the Ext success indication (not returning {success: true})
+                        this.bulkExecute(Ext.decode(action.response.responseText));
+                        this.fireEvent('submitsuccess');
+                      },
+                      scope: this
+                    });
+                  } else {
+                    // Submit the data and process the result
+                    this.netzkeSubmit(Ext.apply((this.baseParams || {}), {data:Ext.encode(values)}), function(result){
+                      if (result === "ok") {this.fireEvent("submitsuccess")};
+                    }, this);
+                  }
+                }
+              }
+            END_OF_JAVASCRIPT
+          }
+        end
+    
+      end
+    end
+  end
+end