netzke-basepack 0.5.8 → 0.5.9

data/lib/netzke/grid_panel/record_form_window.rb

@@ -36,7 +36,13 @@ module Netzke
               this.close();
             }
           END_OF_JAVASCRIPT
-        
+          
+          :on_test => <<-END_OF_JAVASCRIPT.l,
+            function(){
+              console.info("this.parent: ", this.getParent());
+            }
+          END_OF_JAVASCRIPT
+          
         }
       end
     end

data/lib/netzke/json_array_editor.rb

@@ -0,0 +1,61 @@
+module Netzke
+  # Abstract GridPanel-based editor for a JSON array of homogenious objects.
+  # Inherit from it in order to override:
+  #   <tt>store_data</p> - passes the data to be saved (e.g. to the persistant storage)
+  #   <tt>initial_data</p> - should return initial data (e.g. from the persistant storage)
+  # For an example of an implementation, see Netzke::FieldsConfigurator.
+  class JsonArrayEditor < GridPanel
+    def initialize(*args)
+      super
+      data_class.configure(:owner => global_id, :columns => dynamic_fields, :initial_data => initial_data)
+    end
+    
+    def data_class
+      NetzkePersistentArrayAutoModel
+    end
+
+    # Fields for NetzkePersistentArrayAutoModel (override it)
+    def dynamic_fields
+      default_columns.collect { |c| {:name => c[:name], :type => c[:attr_type], :default => c[:default_value]} }
+    end
+
+    # Default predifined columns (override if needed)
+    def default_columns
+      [{
+        :name => :id,
+        :attr_type => :integer
+      },{
+        :name => :name,
+        :attr_type => :string
+      },{
+        :name => :position,
+        :attr_type => :integer
+      }]
+    end
+    
+    # Don't show the config tool
+    # def config_tool_needed?
+    #   false
+    # end
+    
+    def before_load
+      data_class.rebuild_table
+      super
+    end
+    
+    private
+      # Override this
+      def store_data(data); end
+    
+      # Override this
+      def initial_data
+        []
+      end
+    
+      # This is an override of GridPanel#on_data_changed
+      def on_data_changed
+        store_data(data_class.all_columns)
+      end
+
+  end
+end

data/lib/netzke/plugins/configuration_tool.rb

@@ -22,7 +22,7 @@ module Netzke::Plugins
 
       # if you include ConfigurationTool, you are supposed to provide configuration_widgets method which will returns an array of arrgeratees
       # that will be included in the property window (each in its own tab or accordion pane)
-      raise "configuration_widgets method undefined" unless base.instance_methods.include?("configuration_widgets")
+      raise "configuration_widgets method undefined" unless base.instance_methods.map(&:to_sym).include?(:configuration_widgets)
     end
 
     module ClassMethods

data/lib/netzke/property_editor.rb

@@ -16,12 +16,12 @@ module Netzke
       {:restore_defaults => {:text => "Restore defaults"}}
     end
 
-    def get_columns
+    def fields
       fields = @widget.class.property_fields
 
       for f in fields
         f[:value] = @widget.flat_config(f[:name]).nil? ? f[:default] : @widget.flat_config(f[:name])
-        f[:xtype] = XTYPE_MAP[f[:type]]
+        f[:xtype] = xtype_for_attr_type(f[:type])
         f[:field_label] = f[:name].to_s.gsub("__", "/").humanize
       end
       
@@ -95,7 +95,7 @@ module Netzke
     end
     
     def normalize_form_value(value, field)
-      case field[:type]
+      case field[:attr_type]
       when :boolean
         value.to_b
       when :json

data/lib/netzke/search_panel.rb

@@ -5,7 +5,8 @@ module Netzke
   # Pretty much work in progress.
   class SearchPanel < FormPanel
     
-    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]
+    # 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} 
     
     def default_config
       super.merge({
@@ -13,50 +14,186 @@ module Netzke
       })
     end
     
-    def default_columns
-      res = super
-
-      res.map! do |f| 
-        norm_column = normalize_column(f)
-        norm_column.merge!({
-          :condition => "equals"
-        })
-        norm_column.merge!(:hidden => true) if norm_column[:name].to_s.index("__") || norm_column[:xtype] == :xcheckbox
+    def independent_config
+      super.deep_merge(
+        :ext_config => {
+          :tbar => ["Presets:", 
+            {
+              :xtype => "combo", 
+              :fieldLabel => "Presets",
+              :triggerAction => "all",
+              :store => (persistent_config[:saved_searches] || []).map{ |s| s["name"] },
+              :id => "presets-combo",
+              :listeners => {:before_select => {
+                :fn => "function(combo, record){Ext.getCmp('#{global_id}').selectPreset(record.data.field1);}".l
+              }}
+            }, :save, :del]
+        }
+      )
+    end
+    
+    def actions
+      super.merge(
+        :save => {:text => "Save", :icon => "/images/icons/disk.png"},
+        :del => {:text => "Delete", :icon => "/images/icons/delete.png"}
+      )
+    end
+    
+    def self.js_extend_properties
+      {
+        :remove_search_from_list => <<-END_OF_JAVASCRIPT.l,
+          function(name){
+            var presetsCombo = Ext.getCmp("presets-combo");
+            var presetsComboStore = presetsCombo.getStore();
+            presetsComboStore.removeAt(presetsComboStore.find('field1', name));
+            presetsCombo.reset();
+            this.getForm().reset();
+          }
+        END_OF_JAVASCRIPT
+        
+        :set_values => <<-END_OF_JAVASCRIPT.l,
+          function(values){
+            this.getForm().setValues(Ext.decode(values));
+          }
+        END_OF_JAVASCRIPT
         
-        norm_column
+        :select_preset => <<-END_OF_JAVASCRIPT.l,
+          function(name){
+            this.getForm().reset();
+            this.loadSearch({name: name});
+          }
+        END_OF_JAVASCRIPT
+        
+        :on_save => <<-END_OF_JAVASCRIPT.l,
+          function(){
+            var searchName = Ext.getCmp("presets-combo").getValue();
+            if (searchName !== "") {
+              var presetsComboStore = Ext.getCmp("presets-combo").getStore();
+              if (presetsComboStore.find('field1', searchName) !== -1) {
+                Ext.Msg.confirm("Overwriting preset '" + searchName + "'", "Are you sure you want to overwrite this preset?", function(btn, text){
+                  if (btn == 'yes') {
+                     this.doSavePreset(searchName);
+                  }
+                }, this);
+              } else {
+                this.doSavePreset(searchName);
+                presetsComboStore.add(new presetsComboStore.recordType({field1: searchName}));
+              }
+            }
+          }
+        END_OF_JAVASCRIPT
+        
+        :do_save_preset => <<-END_OF_JAVASCRIPT.l,
+          function(name){
+            var values = this.getForm().getValues();
+            for (var k in values) {
+              if (values[k] == "") {delete values[k]}
+            }
+          
+            this.saveSearch({
+              name: name,
+              values: Ext.encode(values)
+            });
+          }
+        END_OF_JAVASCRIPT
+        
+        :on_del => <<-END_OF_JAVASCRIPT.l,
+          function(){
+            var searchName = Ext.getCmp("presets-combo").getValue();
+            if (searchName !== "") {
+              Ext.Msg.confirm("Deleting preset '" + searchName + "'", "Are you sure you want to delete this preset?", function(btn, text){
+                if (btn == 'yes') {
+                  this.deleteSearch({
+                    name: searchName
+                  });
+                }
+              }, this);
+            }
+          }
+        END_OF_JAVASCRIPT
+        
+      }
+    end
+    
+    api :save_search
+    def save_search(params)
+      saved_searches = persistent_config[:saved_searches] || []
+      existing = saved_searches.detect{ |s| s["name"] == params[:name] }
+      values = ActiveSupport::JSON.decode(params[:values])
+      if existing
+        existing["values"].replace(values)
+      else
+        saved_searches << {"name" => params[:name], "values" => values}
       end
+      persistent_config[:saved_searches] = saved_searches
+      {:feedback => "Preset successfully saved"}
+    end
+    
+    api :delete_search
+    def delete_search(params)
+      saved_searches = persistent_config[:saved_searches]
+      saved_searches.delete_if{ |s| s["name"] == params[:name] }
+      {:feedback => "Preset successfully deleted", :remove_search_from_list => params[:name]}
+    end
+    
+    api :load_search
+    def load_search(params)
+      saved_searches = persistent_config[:saved_searches]
+      the_search = saved_searches.detect{ |s| s["name"] == params[:name] }
+      
+      {:set_values => the_search["values"].to_json}
+    end
+    
+    def initial_fields(only_included = true)
+      res = super
+
+      res.reject!{ |f| f[:virtual] }
       
+      res.each do |f| 
+        f.merge!(:condition => "like", :default_value => nil)
+        f.merge!(:xtype => xtype_for_attr_type(:string), :attr_type => "string") if f[:name].to_s.index("__")
+        f.merge!(:condition => "greater_than") if [:datetime, :integer, :date].include?(f[:attr_type].to_sym)
+        f.merge!(:condition => "equals") if f["attr_type"] == "boolean"
+      end
+
       res
     end
     
     # columns to be displayed by the FieldConfigurator (which is GridPanel-based)
-    def self.config_columns
-      [
-        {:name => :hidden, :type => :boolean, :editor => :checkbox, :width => 50},
-        {:name => :name, :type => :string, :editor => :combobox},
-        {:name => :condition, :type => :string, :editor => {:xtype => :combobox, :options => CONDITIONS}},
-        {:name => :field_label, :type => :string},
-        {:name => :xtype, :type => :string},
-        {:name => :value, :type => :string},
+    def self.meta_columns
+      [                                         
+        {:name => "hidden",      :attr_type => :boolean, :editor => :checkbox, :width => 50},
+        {:name => "name",        :attr_type => :string,  :editor => :combobox},
+        {:name => "condition",   :attr_type => :string,  :editor => {:xtype => :combo, :store => CONDITIONS}},
+        {:name => "field_label", :attr_type => :string},
+        {:name => "xtype",       :attr_type => :string},
+        {:name => "value",       :attr_type => :string},
       ]
     end
 
     # tweaking the form fields at the last moment
     def js_config
       super.merge({
-        :clmns => columns.map{ |c| c.merge({
-          :field_label => "#{c[:field_label] || c[:name]} #{c[:condition]}".humanize,
+        :fields => fields.map{ |c| c.merge({
+          :label => "#{c[:label] || c[:name]} #{c[:condition]}".humanize,
           :name => "#{c[:name]}_#{c[:condition]}"
         })}
       })
     end
     
-    # we need to correct the queries to cut off the condition suffixes, otherwise the FormPanel gets confused
-    def get_combobox_options(params)
-      column_name = params[:column]
-      CONDITIONS.each { |c| column_name.sub!(/_#{c}$/, "") }
-      super(:column => column_name)
-    end
+    private
+      # we need to correct the queries to cut off the condition suffixes, otherwise the FormPanel gets confused
+      def get_combobox_options(params)
+        column_name = params[:column]
+        CONDITIONS.each { |c| column_name.sub!(/_#{c}$/, "") }
+        super(:column => column_name)
+      end
+      
+      def attr_type_to_xtype_map
+        super.merge({
+          :boolean => :tricheckbox
+        })
+      end
     
   end
 end

data/lib/netzke/tab_panel.rb

@@ -28,23 +28,25 @@ module Netzke
             
             // We do this all in +render+ because only at this moment the activeTab is actually activated
             var activeTab = this.getActiveTab();
-            this.loadWidgetInto(activeTab);
+            
+            // Insert (render) preloaded widgets into their respective tabs
+            this.items.each(function(fitPanel){
+              var preloadedItemConfig = this[fitPanel.widget.camelize(true)+"Config"];
+              if (preloadedItemConfig){
+                var klass = this.classifyScopedName(preloadedItemConfig.scopedClassName);
+                fitPanel.add(new klass(preloadedItemConfig));
+              }
+            }, this);
+            
+            // setting the tabchange event
             this.on('tabchange', this.onTabChange, this);
           }
         END_OF_JAVASCRIPT
         
+        # loads widget from the server
         :load_widget_into => <<-END_OF_JAVASCRIPT.l,
           function(fitPanel){
-            var preloadedItemConfig = this[fitPanel.widget.camelize(true)+"Config"];
-            if (preloadedItemConfig){
-              // preloaded widget only needs to be instantiated, as its class and configuration have already been loaded
-              var klass = this.classifyScopedName(preloadedItemConfig.scopedClassName);
-              fitPanel.add(new klass(preloadedItemConfig));
-              fitPanel.doLayout();
-            } else {
-              // load the widget from the server
-              this.loadAggregatee({id:fitPanel.widget, container:fitPanel.id});
-            }
+            this.loadAggregatee({id:fitPanel.widget, container:fitPanel.id});
           }
         END_OF_JAVASCRIPT
         
@@ -78,7 +80,7 @@ module Netzke
         
         :on_tab_change => <<-END_OF_JAVASCRIPT.l
           function(self, tab) {
-            // load widget into the panel if it wasn't loaded yet
+            // load widget into the panel from the server if it's not there yet
             if (!tab.getWidget()) {
               this.loadWidgetInto(tab);
             }

data/stylesheets/basepack.css

@@ -1,5 +1,5 @@
 /* Fix for Ext's EditableItem render problem (from http://www.extjs.com/forum/showthread.php?p=290267#post290267) */
-.x-menu div.x-menu-item .x-menu-item-icon {
+/*.x-menu div.x-menu-item .x-menu-item-icon {
 left: 0px;
 margin-top: 0px !important;
 position:relative;
@@ -14,7 +14,7 @@ left: 3px;
 .ext-ie6 .x-menu-item-icon {
 left: -24px;
 }
-
+*/
 /* write accordion header in bold */
 .x-accordion-hd {
 	font-weight:bold;
@@ -28,4 +28,45 @@ left: -24px;
 /* StatusBar - fixing forgotten "!important" */
 .x-statusbar .x-status-busy {
     padding-left: 25px !important;
+}
+
+/* Tri-state checkbox */
+.x-form-tscheckbox {
+	height: 13px;
+	width: 13px;
+	background: url('basepack/ts-checkbox.gif') no-repeat 0 0;
+	vertical-align: bottom;
+}
+.x-checkbox-checked .x-form-tscheckbox {
+	background-position:0 -13px;
+}
+.x-checkbox-undef .x-form-tscheckbox {
+	background-position:0 -26px;
+}
+.x-item-disabled .x-form-tscheckbox {
+	background-position:-39px 0;
+}
+.x-form-check-over .x-form-tscheckbox {
+	background-position: -13px 0;
+}
+.x-form-check-down .x-form-tscheckbox {
+	background-position:-26px 0;
+}
+.x-checkbox-checked .x-form-check-over .x-form-tscheckbox {
+	background-position:-13px -13px;
+}
+.x-checkbox-checked .x-form-check-down .x-form-tscheckbox {
+	background-position:-26px -13px;
+}
+.x-checkbox-checked.x-item-disabled .x-form-tscheckbox {
+	background-position:-39px -13px;
+}
+.x-checkbox-undef .x-form-check-over .x-form-tscheckbox {
+	background-position:-13px -26px;
+}
+.x-checkbox-undef .x-form-check-down .x-form-tscheckbox {
+	background-position:-26px -26px;
+}
+.x-checkbox-undef.x-item-disabled .x-form-tscheckbox {
+	background-position:-39px -26px;
 }

data/test/app_root/app/models/book.rb

@@ -1,7 +1,7 @@
 class Book < ActiveRecord::Base
   belongs_to :genre
   
-  # netzke_virtual_attribute :recent => {:read_only => true}
+  netzke_attribute :recent
   
   def recent
     updated_at > 1.hour.ago ? "Yes" : "No"