netzke-basepack 0.6.0 → 0.6.1

data/{app/components → lib}/netzke/basepack/grid_panel/javascripts/rows-dd.js

@@ -135,7 +135,7 @@ Ext.ux.dd.GridDragDropRowOrder = Ext.extend(Ext.util.Observable,
                 {
                     sm.selectRecords(data.selections);
                 }
-                
+
                 // console.info(this.gridDropTarget);
 
                 // fire the after move/copy event

data/{app/components → lib}/netzke/basepack/grid_panel/multi_edit_form.rb

@@ -2,14 +2,14 @@ module Netzke
   module Basepack
     class GridPanel < Netzke::Base
       class MultiEditForm < FormPanel
-      
+
         # Replace checkbox for boolean fields with tristate checkbox
         def attr_type_to_xtype_map
           super.merge({
             :boolean => :tricheckbox
           })
         end
-      
+
       end
     end
   end

data/{app/components → lib}/netzke/basepack/grid_panel/record_form_window.rb

@@ -3,12 +3,12 @@ module Netzke
     class GridPanel < Netzke::Base
       class RecordFormWindow < Window
         js_properties :button_align => "right"
-        
+
         config :modal => true,
               :width => "50%",
               :auto_height => true,
               :fbar => [:ok.action, :cancel.action]
-        
+
         action :ok, :text => 'OK'
         action :cancel
 
@@ -24,7 +24,7 @@ module Netzke
             this.getNetzkeComponent().onApply();
           }
         JS
-        
+
         js_method :on_cancel, <<-JS
           function(params){
             this.close();

data/{app/components → lib}/netzke/basepack/grid_panel/search_window.rb

@@ -6,18 +6,18 @@ module Netzke
         action :search
         action :cancel
         action :clear, :icon => :application_form
-        
-        js_properties :title => "Advanced Search", 
+
+        js_properties :title => "Advanced Search",
                       :width => "50%",
                       :auto_height => true,
                       :buttons => [:search.action, :cancel.action],
                       :tbar => [:clear.action]
-        
+
         config :items => [js_component(:search_panel)]
-        
+
         component :search_panel do
           {
-            :class_name => "Basepack::SearchPanel", 
+            :class_name => "Basepack::SearchPanel",
             :model => config[:model],
             :items => config[:fields]
           }
@@ -32,24 +32,24 @@ module Netzke
         js_method :on_search, <<-JS
           function(){
             this.conditions = this.items.first().getForm().getValues();
-            
+
             // do not send values of empty values
             for (var cond in this.conditions) {
               if (this.conditions[cond] == "") delete this.conditions[cond];
             }
-            
-            this.closeRes = 'OK'; 
+
+            this.closeRes = 'OK';
             this.close();
           }
         JS
-        
+
         js_method :on_cancel, <<-JS
           function(){
-            this.closeRes = 'cancel'; 
+            this.closeRes = 'cancel';
             this.close();
           }
         JS
-        
+
       end
     end
   end

data/{app/components → lib}/netzke/basepack/grid_panel/services.rb

@@ -7,9 +7,9 @@ module Netzke
     class GridPanel < Netzke::Base
       module Services
         extend ActiveSupport::Concern
-      
+
         included do
-      
+
           endpoint :get_data do |*args|
             params = args.first || {} # params are optional
             if !config[:prohibit_read]
@@ -30,9 +30,9 @@ module Netzke
                 mod_records[operation] = nil if mod_records[operation].empty?
               end
             end
-        
+
             on_data_changed
-        
+
             {
               :update_new_records => mod_records[:create],
               :update_mod_records => mod_records[:update] || {},
@@ -103,16 +103,16 @@ module Netzke
             end
             {}
           end
-        
+
         end
         #
         # Some components' overridden API
         #
-    
+
         ## Edit in form specific API
         def add_form__form_panel0__netzke_submit(params)
           res = component_instance(:add_form__form_panel0).netzke_submit(params)
-      
+
           if res[:set_form_values]
             # successful creation
             on_data_changed
@@ -128,21 +128,21 @@ module Netzke
             on_data_changed
             res[:set_form_values] = nil
           end
-      
+
           res.to_nifty_json
         end
 
         def multi_edit_form__multi_edit_form0__netzke_submit(params)
           ids = ActiveSupport::JSON.decode(params.delete(:ids))
           data = ids.collect{ |id| ActiveSupport::JSON.decode(params[:data]).merge("id" => id) }
-          
+
           data.map!{|el| el.delete_if{ |k,v| v.blank? }} # only interested in set values
-        
+
           mod_records_count = process_data(data, :update).count
-        
+
           # remove duplicated flash messages
           @flash = @flash.inject([]){ |r,hsh| r.include?(hsh) ? r : r.push(hsh) }
-        
+
           if mod_records_count > 0
             on_data_changed
             flash :notice => "Updated #{mod_records_count} records."
@@ -151,17 +151,17 @@ module Netzke
             {:feedback => @flash}.to_nifty_json
           end
         end
-      
+
         # When providing the edit_form component, fill in the form with the requested record
         def deliver_component(params)
           components[:edit_form][:items].first.merge!(:record_id => params[:record_id].to_i) if params[:name] == 'edit_form'
           super
         end
-      
+
         protected
-        
+
           def get_records(params)
-          
+
             # Restore params from component_session if requested
             if params[:with_last_params]
               params = component_session[:last_params]
@@ -169,10 +169,10 @@ module Netzke
               # remember the last params
               component_session[:last_params] = params
             end
-      
+
             # build initial relation based on passed params
             relation = get_relation(params)
-                        
+
             # addressing the n+1 query problem
             columns.each do |c|
               assoc, method = c[:name].split('__')
@@ -207,27 +207,27 @@ module Netzke
               relation.all
             end
           end
-    
+
           # An ActiveRecord::Relation instance encapsulating all the necessary conditions
           def get_relation(params)
             # make params coming from Ext grid filters understandable by meta_where
             conditions = params[:filter] && convert_filters(params[:filter]) || {}
-          
+
             relation = data_class.where(conditions)
-            
+
             if params[:extra_conditions]
               extra_conditions = normalize_extra_conditions(ActiveSupport::JSON.decode(params[:extra_conditions]))
               relation = relation.extend_with_netzke_conditions(extra_conditions) if params[:extra_conditions]
             end
-          
+
             relation = relation.extend_with(config[:scope]) if config[:scope]
-          
+
             relation
           end
-      
+
           # Override this method to react on each operation that caused changing of data
           def on_data_changed; 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
@@ -266,7 +266,7 @@ module Netzke
                     break
                   end
                 end
-        
+
                 # try to save
                 # modified_records += 1 if success && record.save
                 mod_records[id] = record.to_array(columns) if success && record.save
@@ -314,10 +314,10 @@ module Netzke
               if method
                 assoc = data_class.reflect_on_association(assoc.to_sym)
                 field = [assoc.klass.table_name, method].join('.').to_sym
-              else 
+              else
                 field = assoc.to_sym
               end
-              
+
               value = v["data"]["value"]
               case v["data"]["type"]
               when "string"

data/{app/components → lib}/netzke/basepack/search_panel.rb

@@ -1,15 +1,15 @@
 module Netzke
   module Basepack
     class SearchPanel < FormPanel
-      
+
       js_properties :header => false,
                     :bbar => false
 
       # An override
       def normalize_field(f)
-        f = if f.is_a?(Symbol) || f.is_a?(String) 
+        f = if f.is_a?(Symbol) || f.is_a?(String)
           {:name => f.to_s, :operator => default_operator}
-        else 
+        else
           search_condition = f[:name]
           if search_condition.is_a?(MetaWhere::Column)
             {:name => search_condition.column, :operator => search_condition.method}
@@ -17,17 +17,17 @@ module Netzke
             {:name => search_condition.to_s}
           end
         end
-    
+
         f = super(f)
-    
+
         f[:disabled] = primary_key_attr?(f)
-        
+
         # Association field
         if f[:name].to_s.index("__")
           f[:xtype] ||= xtype_for_attr_type(:string)
           f[:attr_type] = :string
         end
-        
+
         f[:operator] ||= "gt" if [:datetime, :integer, :date].include?(f[:attr_type])
         f[:operator] ||= "eq" if f[:attr_type] == :boolean
         f[:operator] ||= default_operator
@@ -35,25 +35,25 @@ module Netzke
         f[:field_label] = [f[:field_label], f[:operator]].join(" ")
         f.merge(:name => [f[:name], f[:operator]].join("__"))
       end
-  
+
       private
         def default_operator
           "like"
         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
-      
+
         def attr_type_to_xtype_map
           super.merge({
             :boolean => :tricheckbox
           })
         end
-        
+
     end
   end
 end

data/{app/components → lib}/netzke/basepack/tab_panel.rb

@@ -1,32 +1,32 @@
 module Netzke
   module Basepack
     # = TabPanel
-    # 
+    #
     # Features:
     # * Dynamically loads components for the tabs that get activated for the first time
     # * Is loaded along with the active component - saves a request to the server
     # * (TODO) Provides the method markTabsOutdated to mark all inactive tabs as 'outdated', and calls "update" method on components in tabs when they get activated
     # * (TODO) Stores the last active tab in persistent_config
-    # 
+    #
     # ToDo:
     # * Introduce a second or two delay before informing the server about a tab switched
     class TabPanel < Netzke::Base
-      
+
       include WrapLazyLoaded
-      
+
       js_base_class "Ext.TabPanel"
-      
+
       js_method :init_component, <<-JS
         function(params){
           #{js_full_class_name}.superclass.initComponent.call(this);
           this.on('tabchange', function(self, i){
-            if (i.wrappedComponent && !i.items.first()) {
+            if (i && i.wrappedComponent && !i.items.first()) {
               this.loadComponent({name: i.wrappedComponent, container: i.id});
             }
           }, this);
         }
       JS
-      
+
     end
   end
 end

data/lib/netzke/basepack/version.rb

@@ -3,7 +3,7 @@ module Netzke
     module Version
       MAJOR = 0
       MINOR = 6
-      PATCH = 0
+      PATCH = 1
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end

data/{app/components → lib}/netzke/basepack/window.rb

@@ -2,34 +2,34 @@ module Netzke
   module Basepack
     # == Window
     # Ext.Window-based component able to nest other Netzke components
-    # 
+    #
     # == Features
     # * Persistent position and dimensions
-    # 
+    #
     # == Instance configuration
     # <tt>:item</tt> - nested Netzke component, e.g.:
-    #     
+    #
     #     netzke :window, :item => {:class_name => "GridPanel", :model => "User"}
     class Window < Netzke::Base
       # Based on Ext.Window, naturally
       def self.js_base_class
         "Ext.Window"
       end
-    
+
       js_properties(
         # we nest component inside the "fit" layout
         :layout => "fit"
-      
+
         # default width and height
-        # :width => 300, 
+        # :width => 300,
         # :height => 200
       )
-    
+
       js_method :init_component, <<-END_OF_JAVASCRIPT
         function(){
           // superclass' initComponent
           #{js_full_class_name}.superclass.initComponent.call(this);
-        
+
           // set the move and resize events after window is shown, so that they don't fire at initial rendering
           this.on("show", function(){
             this.on("move", this.onMoveResize, this);
@@ -42,7 +42,7 @@ module Netzke
           }
         }
       END_OF_JAVASCRIPT
-      
+
       js_method :on_move_resize, <<-END_OF_JAVASCRIPT
         function(){
           var x = this.getPosition()[0], y = this.getPosition()[1], w = this.getSize().width, h = this.getSize().height;
@@ -50,20 +50,20 @@ module Netzke
           // Don't bother the server twice when both move and resize events are fired at the same time
           // (which happens when the left or upper window border is dragged)
           if (this.moveResizeTimer) {clearTimeout(this.moveResizeTimer)};
-        
+
           this.moveResizeTimer = (function(sizeAndPosition){
             this.setSizeAndPosition(sizeAndPosition); // API call
           }).defer(10, this, [{x:x, y:y, w:w, h:h}]); // 10ms should be enough
         }
       END_OF_JAVASCRIPT
-      
+
       # Processing API calls from client
       endpoint :set_size_and_position do |params|
         Rails.logger.debug "!!! IMPLEMENT ME (set_size_and_position)\n"
         # update_persistent_ext_config(
-        #   :x => params[:x].to_i, 
-        #   :y => params[:y].to_i, 
-        #   :width => params[:w].to_i, 
+        #   :x => params[:x].to_i,
+        #   :y => params[:y].to_i,
+        #   :width => params[:w].to_i,
         #   :height => params[:h].to_i
         # )
         {}