netzke-basepack 0.5.4 → 0.5.5

data/lib/netzke/border_layout_panel.rb

@@ -49,7 +49,8 @@ module Netzke
                 var regionConfig = this.regions[r] || {};
                 regionConfig.layout = 'fit';
                 regionConfig.region = r;
-                regionConfig.items = [new Ext.netzke.cache[this[configName].widgetClassName](this[configName])]
+                var klass = this.classifyScopedName(this[configName].scopedClassName);
+                regionConfig.items = [new klass(this[configName])]
                 this.items.push(regionConfig);
 
                 // A function to access a region widget (even if the widget gets reloaded, the function will work).
@@ -61,7 +62,7 @@ module Netzke
             }, this);
             
             // Now let Ext.Panel do the rest
-            Ext.netzke.cache.BorderLayoutPanel.superclass.initComponent.call(this);
+            #{js_full_class_name}.superclass.initComponent.call(this);
             
             // First time on "afterlayout", set resize events
             if (this.persistentConfig) {this.on('afterlayout', this.setResizeEvents, this, {single: true});}
@@ -119,6 +120,7 @@ module Netzke
     # API
     api :resize_region # handles regions resize
     def resize_region(params)
+      # Write to persistent_config such way that these settings are automatically picked up by region widgets
       persistent_config["regions__#{params["region_name"]}__region_config__width"] = params["new_width"].to_i if params["new_width"]
       persistent_config["regions__#{params["region_name"]}__region_config__height"] = params["new_height"].to_i if params["new_height"]
       {}

data/lib/netzke/fields_configurator.rb

@@ -55,7 +55,7 @@ module Netzke
           }
         END_OF_JAVASCRIPT
         
-        :defaults => <<-END_OF_JAVASCRIPT.l,
+        :on_defaults => <<-END_OF_JAVASCRIPT.l,
           function(){
             Ext.Msg.confirm('Confirm', 'Are you sure?', function(btn){
               if (btn == 'yes') {
@@ -70,7 +70,7 @@ module Netzke
     def load_defaults(params)
       config[:widget].persistent_config[:layout__columns] = config[:widget].default_columns
       NetzkeAutoColumn.rebuild_table
-      {:load_store_data => get_data, :reconfigure => js_config}
+      {:load_store_data => get_data}
     end
    
     def commit(params)

data/lib/netzke/form_panel.rb

@@ -43,11 +43,13 @@ module Netzke
     # Extra javascripts
     def self.include_js
       [
-        "#{File.dirname(__FILE__)}/form_panel_extras/javascripts/xcheckbox.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"
       ]
     end
     
-    api :submit, :load, :get_combobox_options
+    api :netzke_submit, :netzke_load, :get_combobox_options
 
     attr_accessor :record
     
@@ -89,7 +91,7 @@ module Netzke
     end
     
     def columns
-      @columns ||= get_columns.convert_keys{|k| k.to_sym}
+      @columns ||= get_columns.deep_convert_keys{|k| k.to_sym}
     end
     
     # parameters used to instantiate the JS object
@@ -171,7 +173,7 @@ module Netzke
         # we didn't have columns configured in widget's config, so, use the columns from the data class
         columns_for_create = predefined_columns
       else
-        raise ArgumentError, "No columns specified for widget '#{id_name}'"
+        raise ArgumentError, "No columns specified for widget '#{global_id}'"
       end
       
       columns_for_create.map! do |c|

data/lib/netzke/form_panel_api.rb

@@ -1,15 +1,26 @@
 module Netzke
   module FormPanelApi
     # API handling form submission
-    def submit(params)
-      data_hsh = ActiveSupport::JSON.decode(params[:data])
-      create_or_update_record(data_hsh)
+    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(hsh)
+    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"))
+      @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?
@@ -24,16 +35,9 @@ module Netzke
           break
         end
       end
-  
-      if success && @record.save
-        {:set_form_values => array_of_values}
-      else
-        # flash eventual errors
-        @record.errors.each_full do |msg|
-          flash :error => msg
-        end
-        {:feedback => @flash}
-      end
+      
+      # did we have complete success?
+      success && @record.save
     end
 
     # API handling form load
@@ -47,7 +51,7 @@ module Netzke
     #   {:data => [array_of_values]}
     # end
     
-    def load(params)
+    def netzke_load(params)
       @record = data_class && data_class.find_by_id(params[:id])
       {:set_form_values => array_of_values}
     end

data/lib/netzke/form_panel_extras/javascripts/netzkefileupload.js

@@ -0,0 +1,5 @@
+Ext.netzke.FileUploadField = Ext.extend(Ext.ux.form.FileUploadField, {
+  buttonText: "..."
+});
+
+Ext.reg('netzkefileuploadfield', Ext.netzke.FileUploadField);

data/lib/netzke/form_panel_js.rb

@@ -50,7 +50,7 @@ module Netzke
               delete this.clmns; // we don't need them anymore
               
               // Now let Ext.form.FormPanel do the rest
-              Ext.netzke.cache.FormPanel.superclass.initComponent.call(this);
+              #{js_full_class_name}.superclass.initComponent.call(this);
               
               // Apply event
               this.addEvents('apply');
@@ -59,14 +59,14 @@ module Netzke
 
           # Defaults for each field
           :defaults       => {
-            # :anchor       => '-20', # to leave some space for the scrollbar
-            :width => 180,
+            :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.apply();
+          					if (event.getKey() == 13) this.ownerCt.onApply();
           				}
       				  END_OF_JAVASCRIPT
     				  }
@@ -85,7 +85,7 @@ module Netzke
 
           :load_record => <<-END_OF_JAVASCRIPT.l,
             function(id, neighbour){
-              this.load({id:id});
+              this.netzkeLoad({id:id});
             }
           END_OF_JAVASCRIPT
           
@@ -106,11 +106,30 @@ module Netzke
           :on_apply => <<-END_OF_JAVASCRIPT.l
             function() {
               if (this.fireEvent('apply', this)) {
-                var values = this.form.getValues();
+                var values = this.getForm().getValues();
                 for (var k in values) {
                   if (values[k] == "") {delete values[k]}
                 }
-                this.submit(Ext.apply((this.baseParams || {}), {data:Ext.encode(values)}));
+                if (this.fileUpload) {
+                  // Not a Netzke's standard API call, because the form is multipart
+                  this.getForm().submit({
+                    url: this.id + '__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

data/lib/netzke/grid_panel.rb

@@ -64,7 +64,7 @@ module Netzke
     include Netzke::DataAccessor
 
     def self.enforce_config_consistency
-      config[:default_config][:ext_config][:enable_edit_in_form] &&= config[:edit_in_form_available]
+      config[:default_config][:ext_config][:enable_edit_in_form]    &&= config[:edit_in_form_available]
       config[:default_config][:ext_config][:enable_extended_search] &&= config[:extended_search_available]
       config[:default_config][:ext_config][:enable_rows_reordering] &&= config[:rows_reordering_available]
     end
@@ -143,7 +143,7 @@ module Netzke
     api :create_new_record if config[:edit_in_form_available]
 
     def data_class
-      @data_class ||= config[:data_class_name].nil? ? raise(ArgumentError, "No data_class_name specified for widget #{id_name}") : config[:data_class_name].constantize
+      @data_class ||= config[:data_class_name].nil? ? raise(ArgumentError, "No data_class_name specified for widget #{global_id}") : config[:data_class_name].constantize
     end
 
     
@@ -188,7 +188,7 @@ module Netzke
         {:name => :ext_config__context_menu,        :type => :json},
         {:name => :ext_config__enable_pagination,   :type => :boolean, :default => true},
         {:name => :ext_config__rows_per_page,       :type => :integer},
-        {:name => :ext_config__bbar,              :type => :json},
+        {:name => :ext_config__bbar,                :type => :json},
         {:name => :ext_config__prohibit_create,     :type => :boolean},
         {:name => :ext_config__prohibit_update,     :type => :boolean},
         {:name => :ext_config__prohibit_delete,     :type => :boolean},
@@ -202,11 +202,11 @@ module Netzke
       
     end
     
-    def initial_config
+    def default_config
       res = super
       
-      res[:ext_config][:bbar] = default_bbar if res[:ext_config][:bbar].nil?
-      res[:ext_config][:context_menu] ||= default_context_menu
+      res[:ext_config][:bbar] = default_bbar
+      res[:ext_config][:context_menu] = default_context_menu
       
       res
     end
@@ -244,17 +244,16 @@ module Netzke
 
     def actions
       # Defaults
-      res = { 
+      { 
         :add          => {:text => 'Add',     :disabled      => ext_config[:prohibit_create]},
         :edit         => {:text => 'Edit',    :disabled      => true},
         :del          => {:text => 'Delete',  :disabled      => true},
-        :apply        => {:text => 'Apply',   :disabled      => ext_config[:prohibit_update] && ext_config[:prohibit_create]},
+        :apply        => {:text => 'Apply',   :disabled      => ext_config[:prohibit_update] &&
+                                                                ext_config[:prohibit_create]},
         :add_in_form  => {:text => 'Add in form', :disabled  => !ext_config[:enable_edit_in_form]},
         :edit_in_form => {:text => 'Edit in form', :disabled => true},
         :search       => {:text => 'Search', :disabled       => !ext_config[:enable_extended_search]}
       }
-      
-      res
     end
 
     def initial_late_aggregatees
@@ -262,6 +261,27 @@ module Netzke
       
       # Edit in form
       res.merge!({
+        :add_form => {
+          :widget_class_name => "GridPanelExtras::RecordFormWindow",
+          :ext_config => {
+            :title => "Add #{config[:data_class_name].humanize}",
+            :button_align => "right"
+          },
+          :item => {
+            :widget_class_name => "FormPanel",
+            :data_class_name => config[:data_class_name],
+            :persistent_config => config[:persistent_config],
+            :strong_default_attrs => config[:strong_default_attrs],
+            :ext_config => {
+              :border => true,
+              :bbar => false,
+              :header => false,
+              :mode => ext_config[:mode]
+            },
+            :record => config[:data_class_name].constantize.new
+          }
+        },
+        
         :edit_form => {
           :widget_class_name => "FormPanel",
           :data_class_name => config[:data_class_name],
@@ -288,6 +308,7 @@ module Netzke
           :widget_class_name => "FormPanel",
           :data_class_name => config[:data_class_name],
           :persistent_config => config[:persistent_config],
+          :strong_default_attrs => config[:strong_default_attrs],
           :ext_config => {
             :bbar => false,
             :header => false,

data/lib/netzke/grid_panel_api.rb

@@ -28,7 +28,7 @@ module Netzke
       end
     end
 
-    def delete_data(params = {})
+    def delete_data(params)
       if !ext_config[:prohibit_delete]
         record_ids = ActiveSupport::JSON.decode(params[:records])
         klass = config[:data_class_name].constantize
@@ -39,24 +39,38 @@ module Netzke
       end
     end
 
+    # Given an index of a column among enabled (non-excluded) columns, provides the index (position) in the table
+    def normalize_index(index)
+      norm_index = 0
+      index.times do
+        while true do
+          norm_index += 1 
+          break unless normalized_columns[norm_index][:excluded]
+        end
+      end
+      norm_index
+    end
+
     def resize_column(params)
       raise "Called api_resize_column while not configured to do so" if ext_config[:enable_column_resize] == false
-      column_at(params[:index].to_i)[:width] = params[:size].to_i
+      column_at(normalize_index(params[:index].to_i))[:width] = params[:size].to_i
       save_columns!
       {}
     end
 
     def hide_column(params)
       raise "Called api_hide_column while not configured to do so" if ext_config[:enable_column_hide] == false
-      column_at(params[:index].to_i)[:hidden] = params[:hidden].to_b
+      column_at(normalize_index(params[:index].to_i))[:hidden] = params[:hidden].to_b
       save_columns!
       {}
     end
 
     def move_column(params)
       raise "Called api_move_column while not configured to do so" if ext_config[:enable_column_move] == false
-      column_to_move = columns.delete_at(params[:old_index].to_i)
-      columns.insert(params[:new_index].to_i, column_to_move)
+      remove_from = normalize_index(params[:old_index].to_i)
+      insert_to = normalize_index(params[:new_index].to_i)
+      column_to_move = columns.delete_at(remove_from)
+      columns.insert(insert_to, column_to_move)
       save_columns!
 
       # reorder the columns on the client side (still not sure if it's not an overkill)
@@ -239,24 +253,24 @@ module Netzke
     end
 
     # Converts Ext.grid.GridFilters filters to searchlogic conditions, e.g.
-    # {"0" => {
-    #   "data" => {
-    #     "type" => "numeric", 
-    #     "comparison" => "gt", 
-    #     "value" => 10 }, 
-    #   "field" => "id"
-    # }, 
-    # "1" => {
-    #   "data" => {
-    #     "type" => "string",
-    #     "value" => "pizza"
-    #   },
-    #   "field" => "food_name"
-    # }}
-    #
-    #  => 
-    #
-    # {"id_gt" => 100, "food_name_contains" => "pizza"}
+    #     {"0" => {
+    #       "data" => {
+    #         "type" => "numeric", 
+    #         "comparison" => "gt", 
+    #         "value" => 10 }, 
+    #       "field" => "id"
+    #     }, 
+    #     "1" => {
+    #       "data" => {
+    #         "type" => "string",
+    #         "value" => "pizza"
+    #       },
+    #       "field" => "food_name"
+    #     }}
+    #     
+    #      => 
+    #     
+    #     {"id_gt" => 100, "food_name_contains" => "pizza"}
     def convert_filters(column_filter)
       res = {}
       column_filter.each_pair do |k,v|
@@ -274,7 +288,7 @@ module Netzke
     end
 
     def normalize_extra_conditions(conditions)
-      conditions.convert_keys{|k| k.to_s.gsub("__", "_").to_sym}
+      conditions.deep_convert_keys{|k| k.to_s.gsub("__", "_").to_sym}
     end
 
     # make params understandable to searchlogic
@@ -292,13 +306,8 @@ module Netzke
     end
     
     ## Edit in form specific API
-    def new_record_form__submit(params)
-      form_data = ActiveSupport::JSON.decode(params[:data])
-      
-      # merge with strong default attirbutes
-      form_data.merge!(config[:strong_default_attrs]) if config[:strong_default_attrs]
-      
-      res = aggregatee_instance(:new_record_form).create_or_update_record(form_data)
+    def new_record_form__netzke_submit(params)
+      res = aggregatee_instance(:new_record_form).netzke_submit(params)
       
       if res[:set_form_values]
         # successful creation
@@ -320,24 +329,21 @@ module Netzke
       end
     end
 
-    def edit_form__submit(params)
-      form_data = ActiveSupport::JSON.decode(params[:data])
-      res = aggregatee_instance(:new_record_form).create_or_update_record(form_data)
+    def edit_form__netzke_submit(params)
+      res = aggregatee_instance(:edit_form).netzke_submit(params)
       
       check_for_positive_result(res)
       
       res.to_nifty_json
     end
 
-    def multi_edit_form__submit(params)
-      form_data = ActiveSupport::JSON.decode(params[:data])
-      form_instance = aggregatee_instance(:new_record_form)
-      
-      ids = ActiveSupport::JSON.decode(params[:ids])
+    def multi_edit_form__netzke_submit(params)
+      ids = ActiveSupport::JSON.decode(params.delete(:ids))
 
       res = {}
       ids.each do |id|
-        res = form_instance.create_or_update_record(form_data.merge("id" => id))
+        form_instance = aggregatee_instance(:edit_form, :record => data_class.find(id))
+        res = form_instance.netzke_submit(params)
         break if !res[:set_form_values]
       end