netzke-basepack 0.3.10 → 0.4.0

data/lib/netzke/fields_configurator.rb

@@ -9,9 +9,8 @@ module Netzke
     def initialize(*args)
       super
 
-      config[:conditions]         = {:layout_id => config[:layout].id}
-      config[:data_class_name]    = config[:layout].items_class
-      # config[:persistent_layout]  = false
+      NetzkeLayoutItem.widget      = config[:widget].id_name
+      config[:data_class_name]     = "NetzkeLayoutItem"
     end
 
     def initial_config
@@ -53,10 +52,19 @@ module Netzke
     end
     
     def load_defaults(params)
-      NetzkeLayout.destroy(config[:layout].id)
-      config[:data_class_name].constantize.create_layout_for_widget(parent.parent)
+      persistent_config.for_widget(config[:widget].id_name){ |p| p[:layout__columns] = config[:widget].default_db_fields }
+      # NetzkeLayoutItem.data = config[:widget].default_db_fields
       {}
     end
     
+    def default_db_fields_with_widget_change
+      NetzkeLayoutItem.widget = config[:widget].id_name
+      res = default_db_fields_without_widget_change
+      NetzkeLayoutItem.widget = id_name
+      res
+    end
+    
+    alias_method_chain :default_db_fields, :widget_change
+    
   end
 end

data/lib/netzke/fields_configurator_old.rb

@@ -0,0 +1,62 @@
+module Netzke
+  class FieldsConfigurator < GridPanel
+    interface :load_defaults
+
+    def self.js_base_class
+      GridPanel
+    end
+    
+    def initialize(*args)
+      super
+
+      config[:conditions]         = {:layout_id => config[:layout].id}
+      config[:data_class_name]    = config[:layout].items_class
+      # config[:persistent_layout]  = false
+    end
+
+    def initial_config
+      super.recursive_merge({
+        :name              => 'columns',
+        :widget_class_name => "GridPanel",
+        :ext_config        => {:title => false}
+      })
+    end
+    
+    def actions
+      super.merge(
+        :defaults => {:text => 'Restore defaults'}
+      )
+    end
+    
+    def bbar
+      super << "-" << "defaults"
+    end
+    
+    def self.js_extend_properties
+      super.merge({
+        :defaults => <<-JS.l,
+          function(){
+            Ext.Msg.confirm('Confirm', 'Are you sure?', function(btn){
+              if (btn == 'yes') {
+                Ext.Ajax.request({
+                  url:this.initialConfig.interface.loadDefaults,
+                  callback:function(){
+                    this.store.reload();
+                  },
+                  scope:this
+                })
+              }
+            }, this);
+          }
+        JS
+      })
+    end
+    
+    def load_defaults(params)
+      NetzkeLayout.destroy(config[:layout].id)
+      config[:data_class_name].constantize.create_layout_for_widget(parent.parent)
+      {}
+    end
+    
+  end
+end

data/lib/netzke/form_panel.rb

@@ -3,7 +3,6 @@ module Netzke
     # Class-level configuration with defaults
     def self.config
       set_default_config({
-        :field_manager => "NetzkeFormPanelField",
       })
     end
 
@@ -12,9 +11,9 @@ module Netzke
     include Netzke::DbFields # database field operations
     
     # extra javascripts
-    js_include %w{ xcheckbox xdatetime }.map{|js| "#{File.dirname(__FILE__)}/form_panel_extras/javascripts/#{js}.js"}
+    js_include %w{ xcheckbox }.map{|js| "#{File.dirname(__FILE__)}/form_panel_extras/javascripts/#{js}.js"}
     
-    interface :submit, :load
+    interface :submit, :load, :get_cb_choices
 
     def self.widget_type
       :form
@@ -34,19 +33,18 @@ module Netzke
 
     def configuration_widgets
       res = []
+      
       res << {
         :name              => 'fields',
         :widget_class_name => "FieldsConfigurator",
-        :ext_config        => {:title => false},
         :active            => true,
-        :layout            => NetzkeLayout.by_widget(id_name),
-        :fields_for        => :form
+        :widget            => self
       } if config[:persistent_layout]
 
       res << {
         :name               => 'general',
         :widget_class_name  => "PropertyEditor",
-        :widget_name   => id_name,
+        :widget_name        => id_name,
         :ext_config         => {:title => false}
       }
       
@@ -67,35 +65,31 @@ module Netzke
       persistent_config[:bottom_bar] ||= config[:bbar] == false ? nil : config[:bbar] || %w{ apply }
     end
     
-    # get fields from layout manager
-    def get_fields
-      @fields ||=
-      if config[:persistent_layout] && layout_manager_class && field_manager_class
-        layout = layout_manager_class.by_widget(id_name)
-        layout ||= field_manager_class.create_layout_for_widget(self)
-        layout.items_arry_without_hidden
-      else
-        default_db_fields
-      end
+    def fields
+      @@fields ||= get_fields
     end
 
     # parameters used to instantiate the JS object
     def js_config
       res = super
-      # we pass column config at the time of instantiating the JS class
-      res.merge!(:fields => get_fields || config[:fields]) # first try to get columns from DB, then from config
+      res.merge!(:fields => fields)
       res.merge!(:data_class_name => config[:data_class_name])
-      res.merge!(:record_data => config[:record].to_array(get_fields)) if config[:record]
+      res.merge!(:record_data => config[:record].to_array(fields)) if config[:record]
       res
     end
  
     protected
     
-    def field_manager_class
-      self.class.config[:field_manager].constantize
-    rescue NameError
-      nil
+    def get_fields
+      if config[:persistent_layout]
+        NetzkeLayoutItem.widget = id_name
+        NetzkeLayoutItem.data = default_db_fields if NetzkeLayoutItem.all.empty?
+        NetzkeLayoutItem.all
+      else
+        default_db_fields
+      end.map{ |r| r.reject{ |k,v| k == :id } }
     end
+      
     
     # def available_permissions
     #   %w{ read update }

data/lib/netzke/form_panel_extras/interface.rb

@@ -10,22 +10,20 @@ module Netzke
         record = klass.find_by_id(params[:id])
         success = true
 
-        if record.nil?
-          record = klass.create(params)
-        else
-          params.each_pair do |k,v|
-            begin
-              record.send("#{k}=",v)
-            rescue ArgumentError => exc
-              flash :error => exc.message
-              success = false
-              break
-            end
+        record = klass.new if record.nil?
+
+        params.each_pair do |k,v|
+          begin
+            record.send("#{k}=",v)
+          rescue StandardError => exc
+            flash :error => exc.message
+            success = false
+            break
           end
         end
     
         if success && record.save
-          {:data => [record.to_array(get_fields)], :success => true}
+          {:data => [record.to_array(fields)], :success => true}
         else
           # flash eventual errors
           record.errors.each_full do |msg|
@@ -42,8 +40,17 @@ module Netzke
         when "next"     then record = klass.next(params[:id])
         else                 record = klass.find(params[:id])
         end
-        {:data => [record && record.to_array(get_fields)]}
+        {:data => [record && record.to_array(fields)]}
+      end
+      
+      # Return the choices for the column
+      def get_cb_choices(params)
+        column = params[:column]
+        query = params[:query]
+    
+        {:data => config[:data_class_name].constantize.choices_for(column, query).map{|s| [s]}}
       end
+        
     end
   end
 end

data/lib/netzke/form_panel_extras/js_builder.rb

@@ -30,7 +30,10 @@ module Netzke
             }
             delete(field.extConfig);
             Ext.apply(field, extConfig);
-          });
+
+            field.parentConfig = config;
+            field.fieldConfig = field;
+          }, this);
           var Record = Ext.data.Record.create(recordFields);
           this.reader = new Ext.data.RecordArrayReader({root:"data"}, Record);
           JS

data/lib/netzke/grid_panel.rb

@@ -1,5 +1,4 @@
 require 'searchlogic'
-require "app/models/netzke_grid_panel_column"
 
 module Netzke
   #
@@ -16,11 +15,16 @@ module Netzke
   # * properties and column configuration
   #
   class GridPanel < Base
-    # Class-level configuration with defaults
+    # Class-level configuration and its defaults
     def self.config
       set_default_config({
-        :column_manager => "NetzkeGridPanelColumn",
-        :enable_filters => true
+        :enable_filters                       => true,
+        :config_tool_enabled_by_default       => false,
+        :column_move_enabled_by_default       => true,
+        :column_hide_enabled_by_default       => true,
+        :column_resize_enabled_by_default     => true,
+        :persistent_layout_enabled_by_default => true,
+        :persistent_config_enabled_by_default => true
       })
     end
 
@@ -42,7 +46,7 @@ module Netzke
 
     # define connection points between client side and server side of GridPanel. 
     # See implementation of equally named methods in the GridPanelExtras::Interface module.
-    interface :get_data, :post_data, :delete_data, :resize_column, :move_column, :get_cb_choices
+    interface :get_data, :post_data, :delete_data, :resize_column, :move_column, :hide_column, :get_cb_choices
 
     # widget type for DbFields
     # TODO: ugly, rethink
@@ -50,27 +54,18 @@ module Netzke
       :grid
     end
 
-    def self.column_manager_class
-      config[:column_manager].constantize
-    rescue
-      nil
-    end
-
-    def column_manager_class
-      self.class.column_manager_class
-    end
-
     # default instance-level configuration
     def initial_config
       {
         :ext_config => {
-          :config_tool           => true,
-          :enable_column_filters => Netzke::GridPanel.config[:enable_filters],
-          :enable_column_move    => true,
-          :enable_column_resize  => true
+          :config_tool           => self.class.config[:config_tool_enabled_by_default],
+          :enable_column_filters => self.class.config[:enable_filters],
+          :enable_column_move    => self.class.config[:column_move_enabled_by_default],
+          :enable_column_hide    => self.class.config[:column_hide_enabled_by_default],
+          :enable_column_resize  => self.class.config[:column_resize_enabled_by_default]
         },
-        :persistent_layout => true,
-        :persistent_config => true
+        :persistent_layout => self.class.config[:persistent_layout_enabled_by_default],
+        :persistent_config => self.class.config[:persistent_config_enabled_by_default]
       }
     end
 
@@ -83,48 +78,40 @@ module Netzke
       res << {
         :name              => 'columns',
         :widget_class_name => "FieldsConfigurator",
-        :ext_config        => {:title => false},
         :active            => true,
-        :layout            => NetzkeLayout.by_widget(id_name)
+        :widget            => self,
+        :persistent_layout => true
       } if config[:persistent_layout]
 
       res << {
         :name               => 'general',
         :widget_class_name  => "PropertyEditor",
-        :widget_name   => id_name,
+        :widget_name        => id_name,
         :ext_config         => {:title => false}
       }
       
       res
     end
 
-    # get columns from layout manager
-    def get_columns
-      @columns ||=
-      if config[:persistent_layout] && layout_manager_class && column_manager_class
-        layout = layout_manager_class.by_widget(id_name)
-        layout ||= column_manager_class.create_layout_for_widget(self)
-        layout.items_arry
-      else
-        default_db_fields
-      end
-    end
-    
     def tools
       %w{ refresh }
     end
 
     def actions
-      { :add    => {:text => 'Add', :disabled => !@permissions[:create]},
-        :edit   => {:text => 'Edit', :disabled => !@permissions[:update]},
-        :delete => {:text => 'Delete', :disabled => !@permissions[:delete]},
-        :apply  => {:text => 'Apply', :disabled => !@permissions[:update] && !@permissions[:create]}
+      { :add    => {:text => 'Add',     :disabled => !@permissions[:create]},
+        :edit   => {:text => 'Edit',    :disabled => !@permissions[:update]},
+        :delete => {:text => 'Delete',  :disabled => !@permissions[:delete]},
+        :apply  => {:text => 'Apply',   :disabled => !@permissions[:update] && !@permissions[:create]}
       }
     end
 
     def bbar
       persistent_config[:bottom_bar] ||= config[:bbar] == false ? nil : config[:bbar] || %w{ add edit apply delete }
     end
+
+    def columns
+      @columns ||= get_columns
+    end
     
     include ConfigurationTool # it will load aggregation with name :properties into a modal window
     
@@ -133,6 +120,16 @@ module Netzke
     def available_permissions
       %w(read update create delete)
     end
+
+    def get_columns
+      if config[:persistent_layout]
+        NetzkeLayoutItem.widget = id_name
+        NetzkeLayoutItem.data = default_db_fields if NetzkeLayoutItem.all.empty?
+        NetzkeLayoutItem.all
+      else
+        default_db_fields
+      end
+    end
     
   end
 end

data/lib/netzke/grid_panel_extras/interface.rb

@@ -40,20 +40,35 @@ module Netzke
 
       def resize_column(params)
         raise "Called interface_resize_column while not configured to do so" unless config[:ext_config][:enable_column_resize]
-        if config[:persistent_layout] && layout_manager_class
-          l_item = layout_manager_class.by_widget(id_name).items[params[:index].to_i]
-          l_item.width = params[:size]
-          l_item.save!
+        if config[:persistent_layout]
+          NetzkeLayoutItem.widget = id_name
+          column = NetzkeLayoutItem.find(params[:index].to_i + 1)
+          column.width = params[:size].to_i
+          column.save
+        end
+        {}
+      end
+  
+      def hide_column(params)
+        raise "Called interface_hide_column while not configured to do so" unless config[:ext_config][:enable_column_hide]
+        if config[:persistent_layout]
+          NetzkeLayoutItem.widget = id_name
+          column = NetzkeLayoutItem.find(params[:index].to_i + 1)
+          column.hidden = params[:hidden].to_b
+          column.save
         end
         {}
       end
   
       def move_column(params)
         raise "Called interface_move_column while not configured to do so" unless config[:ext_config][:enable_column_move]
-        if config[:persistent_layout] && layout_manager_class
-          layout_manager_class.by_widget(id_name).move_item(params[:old_index].to_i, params[:new_index].to_i)
+        if config[:persistent_layout]
+          NetzkeLayoutItem.widget = id_name
+          NetzkeLayoutItem.move_item(params[:old_index].to_i, params[:new_index].to_i)
         end
-        {}
+
+        # provide the client side with the new columns order
+        {:columns => columns.map(&:name)}
       end
 
       # Return the choices for the column
@@ -117,19 +132,8 @@ module Netzke
     
         raise ArgumentError, "No data_class_name specified for widget '#{config[:name]}'" if !config[:data_class_name]
         records = config[:data_class_name].constantize.all(search_params.clone) # clone needed as searchlogic removes :conditions key from the hash
-        # output_array = []
-        columns = get_columns
         output_array = records.map{|r| r.to_array(columns)}
     
-        # records.each do |r|
-        #   r_array = []
-        #   self.get_columns.each do |column|
-        #     r_array << r.send(column[:name])
-        #   end
-        #   output_array << r_array
-        #   output_array << r.to_array(columns)
-        # end
-
         # add total_entries accessor to the result
         class << output_array
           attr :total_records, true