netzke-basepack 0.5.2 → 0.5.3

data/lib/app/models/netzke_auto_column.rb

@@ -42,7 +42,7 @@ class NetzkeAutoColumn < ActiveRecord::Base
     end
 
     # populate the table with data
-    NetzkeAutoColumn.create @@widget.normalized_columns.map(&:deebeefy_values)
+    NetzkeAutoColumn.create @@widget.normalized_columns.map(&:deebeefy_values) rescue ActiveRecord::UnknownAttributeError
     
   end
 

data/lib/netzke/basic_app.rb

@@ -24,6 +24,19 @@ module Netzke
         })
       end
       
+      def 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"
+      end
+      
+      # def include_css
+      #   res = []
+      #   res << Netzke::Base.config[:ext_location] + "/examples/ux/css/StatusBar.css"
+      #   res
+      # end
+      
       def js_panels
         # In status bar we want to show what we are masquerading as
         if session[:masq_user]
@@ -50,6 +63,7 @@ module Netzke
           :id => 'main-statusbar',
           :xtype => 'statusbar',
           :region => 'south',
+          :height => 22,
           :statusAlign => 'right',
           :busyText => 'Busy...',
           :default_text => masq.nil? ? "Ready #{"(config mode)" if session[:config_mode]}" : "Masquerading as #{masq}",
@@ -181,7 +195,7 @@ module Netzke
                 },{
                   text:'As World',
                   handler:function(){
-                    Ext.Msg.confirm("Masquerading as World", "Caution! All settings that you will modify will be ovewritten for all roles and all users. Are you sure you know what you're doing?", function(btn){
+                    Ext.Msg.confirm("Masquerading as World", "Caution! All settings that you will modify will be overwritten for all roles and all users. Are you sure you know what you're doing?", function(btn){
                       if (btn === "yes") {
                         this.masquerade = {world:true};
                         w.close();
@@ -197,7 +211,7 @@ module Netzke
                   },
                   scope:this
                 },{
-                  text:'Cansel',
+                  text:'Cancel',
                   handler:function(){
                     w.hide();
                   },

data/lib/netzke/basic_app_extras/statusbar_ext.js

@@ -0,0 +1,8 @@
+Ext.override(Ext.ux.StatusBar, {
+  hideBusy : function(){
+    return this.setStatus({
+      text: this.defaultText,
+      iconCls: this.defaultIconCls
+    });
+  }
+});

data/lib/netzke/border_layout_panel.rb

@@ -64,7 +64,7 @@ module Netzke
             Ext.netzke.cache.BorderLayoutPanel.superclass.initComponent.call(this);
             
             // First time on "afterlayout", set resize events
-            this.on('afterlayout', this.setResizeEvents, this, {single: true});
+            if (this.persistentConfig) {this.on('afterlayout', this.setResizeEvents, this, {single: true});}
           }
         END_OF_JAVASCRIPT
         

data/lib/netzke/ext.rb

@@ -2,5 +2,6 @@ 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 }
+    COLUMN_XTYPES = %w{ gridcolumn booleancolumn numbercolumn datecolumn }
   end
 end

data/lib/netzke/fields_configurator.rb

@@ -31,10 +31,8 @@ module Netzke
       )
     end
     
-    def independent_config
-      res = super
-      res[:ext_config][:bbar] = %w{ edit apply - defaults }
-      res
+    def default_bbar
+      %w{ edit apply - defaults }
     end
         
     def predefined_columns
@@ -44,7 +42,7 @@ module Netzke
     def self.js_extend_properties
       {
         # Disable the 'gear' tool for now
-        :gear => <<-END_OF_JAVASCRIPT.l,
+        :on_gear => <<-END_OF_JAVASCRIPT.l,
           function(){
             this.feedback("You can't configure configurator (yet)");
           }

data/lib/netzke/form_panel.rb

@@ -22,15 +22,24 @@ module Netzke
         :config_tool_available       => true,
         
         :default_config => {
+          :persistent_config => true,
           :ext_config => {
-            :bbar => %w{ apply },
-            :tools => %w{ }
+            :tools => []
           },
-          :persistent_config => false
         }
       })
     end
     
+    def initial_config
+      res = super
+      res[:ext_config][:bbar] = default_bbar if res[:ext_config][:bbar].nil?
+      res
+    end
+
+    def default_bbar
+      %w{ apply }
+    end
+    
     # Extra javascripts
     def self.include_js
       [
@@ -107,16 +116,11 @@ module Netzke
     def self.property_fields
       res = [
         {:name => :ext_config__title,               :type => :string},
-        {:name => :ext_config__header,              :type => :boolean, :default => true}
-         # {: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},
-        # {:name => :ext_config__prohibit_read,       :type => :boolean}
+        {:name => :ext_config__header,              :type => :boolean, :default => true},
+        {:name => :ext_config__bbar,              :type => :json}
       ]
       
       res
-      
     end
  
     # Normalized columns
@@ -126,7 +130,7 @@ module Netzke
     
  
     def get_columns
-      if config[:persistent_config]
+      if persistent_config_enabled?
         persistent_config['layout__columns'] ||= default_columns
         res = normalize_array_of_columns(persistent_config['layout__columns'])
       else

data/lib/netzke/form_panel_js.rb

@@ -15,7 +15,6 @@ module Netzke
           :auto_scroll    => true,
           :label_width    => 150,
           :default_type   => 'textfield',
-          # :label_align => 'top',
 
           :init_component => <<-END_OF_JAVASCRIPT.l,
             function(){
@@ -87,12 +86,6 @@ module Netzke
           :load_record => <<-END_OF_JAVASCRIPT.l,
             function(id, neighbour){
               this.load({id:id});
-              // var proxy = new Ext.data.HttpProxy({url:this.initialConfig.api.load});
-              // proxy.load({id:id, neighbour:neighbour}, this.reader, function(data){
-              //   if (data){
-              //     this.form.loadRecord(data.records[0])
-              //   }
-              // }, this)
             }
           END_OF_JAVASCRIPT
           
@@ -110,7 +103,7 @@ module Netzke
           #   }
           # END_OF_JAVASCRIPT
           
-          :apply => <<-END_OF_JAVASCRIPT.l
+          :on_apply => <<-END_OF_JAVASCRIPT.l
             function() {
               if (this.fireEvent('apply', this)) {
                 var values = this.form.getValues();

data/lib/netzke/grid_panel.rb

@@ -38,9 +38,9 @@ module Netzke
   # The following config options are available:
   # * <tt>:data_class_name</tt> - name of the ActiveRecord model that provides data to this GridPanel.
   # * <tt>:strong_default_attrs</tt> - a hash of attributes to be merged atop of every created/updated record.
-  # * <tt>:scopes</tt> - an array of searchlogic-compatible scopes to filter grid data like this: 
+  # * <tt>:scopes</tt> - an array of named scopes to filter grid data, e.g.:
   #     
-  #     ["user_id_not", 100]
+  #     [["user_id_not", 100], ["name_like", "Peter"]]
   # 
   # In the <tt>:ext_config</tt> hash (see Netzke::Base) the following GridPanel specific options are available:
   # 
@@ -79,7 +79,7 @@ module Netzke
         :config_tool_available        => true,
         :edit_in_form_available       => true,
         :extended_search_available    => true,
-        :rows_reordering_available    => false,
+        :rows_reordering_available    => true,
         
         :default_config => {
           :ext_config => {
@@ -88,18 +88,15 @@ module Netzke
             :enable_column_filters  => true,
             :load_inline_data       => true,
             :enable_context_menu    => true,
-            
+            :enable_rows_reordering => false, # column drag n drop
             :enable_pagination      => true,
             :rows_per_page          => 25,
+            :tools                  => %w{ refresh },
             
-            :mode                   => :normal, # when set to :config, :configuration button is enabled
-            
-            :enable_rows_reordering => false, # drag n drop
-            
-            :tools => %w{ refresh }
+            :mode                   => :normal # when set to :config, :configuration button is enabled
           },
+          :persistent_config      => true
           
-          :persistent_config => false
         }
       })
     end
@@ -109,22 +106,26 @@ module Netzke
       res = []
       
       # Checkcolumn
-      res << "#{File.dirname(__FILE__)}/grid_panel_extras/javascripts/check-column.js"
+      ext_examples = Netzke::Base.config[:ext_location] + "/examples/"
+      res << ext_examples + "ux/CheckColumn.js"
+      # res << "#{File.dirname(__FILE__)}/grid_panel_extras/javascripts/check-column.js"
+      
       
       # Filters
-      if config[:column_filters_available]
-        ext_examples = Netzke::Base.config[:ext_location] + "/examples/"
-        res << ext_examples + "grid-filtering/menu/EditableItem.js"
-        res << ext_examples + "grid-filtering/menu/RangeMenu.js"
-        res << ext_examples + "grid-filtering/grid/GridFilters.js"
-
-        %w{Boolean Date List Numeric String}.unshift("").each do |f|
-          res << ext_examples + "grid-filtering/grid/filter/#{f}Filter.js"
-        end
-        
-        res << "#{File.dirname(__FILE__)}/grid_panel_extras/javascripts/filters.js"
-        
-      end
+      # Not compatible with Ext 3.0
+      # if config[:column_filters_available]
+      #   ext_examples = Netzke::Base.config[:ext_location] + "/examples/"
+      #   res << ext_examples + "grid-filtering/menu/EditableItem.js"
+      #   res << ext_examples + "grid-filtering/menu/RangeMenu.js"
+      #   res << ext_examples + "grid-filtering/grid/GridFilters.js"
+      # 
+      #   %w{Boolean Date List Numeric String}.unshift("").each do |f|
+      #     res << ext_examples + "grid-filtering/grid/filter/#{f}Filter.js"
+      #   end
+      #   
+      #   res << "#{File.dirname(__FILE__)}/grid_panel_extras/javascripts/filters.js"
+      #   
+      # end
       
       # DD
       if config[:rows_reordering_available]
@@ -160,11 +161,17 @@ module Netzke
         {:name => :value},
         {:name => :header},
         {:name => :hidden,     :type => :boolean, :editor => :checkbox},
-        {:name => :read_only,  :type => :boolean, :editor => :checkbox, :header => "R"},
+        {:name => :editable,  :type => :boolean, :editor => :checkbox, :header => "Editable", :default => true},
         {:name => :editor,     :type => :string, :editor => {:xtype => :combobox, :options => Netzke::Ext::FORM_FIELD_XTYPES}},
         {:name => :renderer,   :type => :string},
+        
+        # maybe later
+        # {:name => :xtype, :type => :string, :editor => {:xtype => :combobox, :options => Netzke::Ext::COLUMN_XTYPES}},
+        
         # {:name => :renderer, :type => :string, :editor => {:xtype => :jsonfield}},
-        {:name => :with_filters,   :type => :boolean, :editor => :checkbox, :default => true, :header => "Filters"},
+        
+        # Filters not supported in Ext 3.0
+        # {:name => :with_filters,   :type => :boolean, :editor => :checkbox, :default => true, :header => "Filters"},
 
         # some rarely used configurations, hidden
         {:name => :width,      :type => :integer, :editor => :numberfield, :hidden => true},
@@ -181,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},
@@ -195,25 +202,25 @@ module Netzke
       
     end
     
-    def independent_config
+    def initial_config
       res = super
       
-      # Bottom bar
-      if res[:ext_config][:bbar].nil?
-        res[:ext_config][:bbar] = %w{ add edit apply del }
-        res[:ext_config][:bbar] << "-" << "add_in_form" << "edit_in_form" if res[:ext_config][:enable_edit_in_form]
-        res[:ext_config][:bbar] << "-" << "search" if res[:ext_config][:enable_extended_search]
-      end
-      
-      # Context menu
-      res[:ext_config][:context_menu] ||= default_context_menu(res)
+      res[:ext_config][:bbar] = default_bbar if res[:ext_config][:bbar].nil?
+      res[:ext_config][:context_menu] ||= default_context_menu
       
       res
     end
     
-    def default_context_menu(indep_config)
+    def default_bbar
+      res = %w{ add edit apply del }
+      res << "-" << "add_in_form" << "edit_in_form" if self.class.config[:edit_in_form_available]
+      res << "-" << "search" if self.class.config[:extended_search_available]
+      res
+    end
+    
+    def default_context_menu
       res = %w{ edit del }
-      res << "-" << "edit_in_form" if indep_config[:ext_config][:enable_edit_in_form]
+      res << "-" << "edit_in_form" if self.class.config[:edit_in_form_available]
       res
     end
     
@@ -238,23 +245,15 @@ 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]}
+        :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]},
+        :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]}
       }
       
-      # Edit in form
-      res.merge!({
-        :add_in_form => {:text => 'Add in form'},
-        :edit_in_form => {:text => 'Edit in form', :disabled => true}
-      }) if ext_config[:enable_edit_in_form]
-      
-      # Extended search
-      res.merge!({
-        :search => {:text => 'Search'}
-      }) if ext_config[:enable_extended_search]
-
       res
     end
 
@@ -265,8 +264,8 @@ module Netzke
       res.merge!({
         :edit_form => {
           :widget_class_name => "FormPanel",
-          :persistent_config => true,
           :data_class_name => config[:data_class_name],
+          :persistent_config => config[:persistent_config],
           :ext_config => {
             :bbar => false,
             :header => false,
@@ -276,8 +275,8 @@ module Netzke
         
         :multi_edit_form => {
           :widget_class_name => "FormPanel",
-          :persistent_config => true,
           :data_class_name => config[:data_class_name],
+          :persistent_config => config[:persistent_config],
           :ext_config => {
             :bbar => false,
             :header => false,
@@ -287,8 +286,8 @@ module Netzke
         
         :new_record_form => {
           :widget_class_name => "FormPanel",
-          :persistent_config => true,
           :data_class_name => config[:data_class_name],
+          :persistent_config => config[:persistent_config],
           :ext_config => {
             :bbar => false,
             :header => false,
@@ -303,7 +302,7 @@ module Netzke
         :search_panel => {
           :widget_class_name => "SearchPanel",
           :search_class_name => config[:data_class_name],
-          :persistent_config => true,
+          :persistent_config => config[:persistent_config],
           :ext_config => {
             :header => false, 
             :bbar => false, 
@@ -328,7 +327,7 @@ module Netzke
     end
 
     def get_columns
-      if config[:persistent_config]
+      if persistent_config_enabled?
         persistent_config['layout__columns'] ||= default_columns
         res = normalize_array_of_columns(persistent_config['layout__columns'])
       else
@@ -421,11 +420,12 @@ module Netzke
         # Some default limitations for virtual columns
         if type == :virtual
           # disable filters
-          c[:with_filters].nil? && c[:with_filters] = false
+          # c[:with_filters].nil? && c[:with_filters] = false
           # disable sorting
           c[:sortable].nil? && c[:sortable] = false
           # read-only
-          c[:read_only].nil? && c[:read_only] = true
+          # c[:read_only].nil? && c[:read_only] = true
+          c[:editable].nil? && c[:editable] = false
         end
         
         # denormalize column (save space)

data/lib/netzke/grid_panel_api.rb

@@ -32,7 +32,7 @@ module Netzke
       if !ext_config[:prohibit_delete]
         record_ids = ActiveSupport::JSON.decode(params[:records])
         klass = config[:data_class_name].constantize
-        klass.delete(record_ids)
+        klass.destroy(record_ids)
         {:feedback => "Deleted #{record_ids.size} record(s)", :load_store_data => get_data}
       else
         {:feedback => "You don't have permissions to delete data"}
@@ -96,7 +96,7 @@ module Netzke
             scope_name, *args = s
             search.send(scope_name, *args)
           else
-            search.send(s)
+            search.send(s, true)
           end
         end