netzke-basepack 0.6.0 → 0.6.1

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

@@ -31,7 +31,7 @@ module Netzke
               # Whether the column will be in the hidden state (hide/show columns from the column menu, if it's enabled).
               {:name => "hidden",        :attr_type => :boolean},
 
-              # Whether the column should have "grid filters" enabled 
+              # Whether the column should have "grid filters" enabled
               # (see here: http://www.extjs.com/deploy/dev/examples/grid-filtering/grid-filter-local.html)
               {:name => "with_filters",  :attr_type => :boolean, :default_value => true, :header => "Filters"},
 
@@ -49,9 +49,9 @@ module Netzke
               {:name => "sortable",      :attr_type => :boolean, :default_value => true, :hidden => true},
             ]
           end
-        
+
         end
-      
+
         # Normalized columns for the grid, e.g.:
         # [{:name => :id, :hidden => true, ...}, {:name => :name, :editable => false, ...}, ...]
         def columns(only_included = true)
@@ -65,7 +65,7 @@ module Netzke
             end
           end
         end
-      
+
         # Columns that we fall back to when neither persistent columns, nor configured columns are present.
         # If there's a model-level field configuration, it's being used.
         # Otherwise the defaults straight from the ActiveRecord model ("netzke_attributes").
@@ -73,18 +73,18 @@ module Netzke
         def default_columns
           @default_columns ||= load_model_level_attrs || data_class.netzke_attributes
         end
-      
+
         # Columns that represent a smart merge of default_columns and columns passed during the configuration.
         def initial_columns(only_included = true)
           # Normalize here, as from the config we can get symbols (names) instead of hashes
           columns_from_config = config[:columns] && normalize_attrs(config[:columns])
-        
-        
+
+
           if columns_from_config
             # automatically add a column that reflects the primary key (unless specified in the config)
             columns_from_config.insert(0, {:name => data_class.primary_key}) unless columns_from_config.any?{ |c| c[:name] == data_class.primary_key }
-          
-            # reverse-merge each column hash from config with each column hash from exposed_attributes 
+
+            # reverse-merge each column hash from config with each column hash from exposed_attributes
             # (columns from config have higher priority)
             for c in columns_from_config
               corresponding_default_column = default_columns.find{ |k| k[:name] == c[:name] }
@@ -95,9 +95,9 @@ module Netzke
             # we didn't have columns configured in component's config, so, use the columns from the data class
             columns_for_create = default_columns
           end
-        
+
           filter_out_excluded_columns(columns_for_create) if only_included
-        
+
           # Make the column config complete with the defaults
           columns_for_create.each do |c|
             detect_association(c)
@@ -112,65 +112,65 @@ module Netzke
 
           columns_for_create
         end
-      
+
         private
           def filter_out_excluded_columns(cols)
             cols.reject!{ |c| c[:included] == false }
           end
-      
+
           # Stores modified columns in persistent storage
           def save_columns!
             # NetzkeFieldList.update_list_for_current_authority(global_id, columns(false), original_data_class.name) if persistent_config_enabled?
           end
-      
+
           def load_columns
             # NetzkeFieldList.read_list(global_id) if persistent_config_enabled?
           end
-        
+
           def load_model_level_attrs
             # NetzkeModelAttrList.read_list(data_class.name) if persistent_config_enabled?
           end
-        
+
           def set_default_header(c)
             c[:label] ||= c[:name].humanize
           end
-        
+
           def set_default_editor(c)
             c[:editor] ||= editor_for_attr_type(c[:attr_type])
             c[:editor] = {:xtype => c[:editor]} if c[:editor].is_a?(Symbol)
           end
-        
+
           def set_default_width(c)
             c[:width] ||= 50 if c[:attr_type] == :boolean
             c[:width] ||= 150 if c[:attr_type] == :datetime
           end
-        
+
           def set_default_hidden(c)
             c[:hidden] = true if primary_key_attr?(c) && c[:hidden].nil?
           end
-        
+
           def set_default_editable(c)
             c[:editable] = c[:read_only].nil? ? !(primary_key_attr?(c) || c[:virtual]) : !c[:read_only]
             c.delete(:read_only)
           end
-        
+
           def set_default_sortable(c)
             c[:sortable] = !c[:virtual] if c[:sortable].nil?
           end
-        
+
           def set_default_filterable(c)
             c[:filterable] = !c[:virtual] if c[:filterable].nil?
           end
-        
+
           # Returns editor's xtype for a column type
           def editor_for_attr_type(type)
             attr_type_to_editor_map[type]
           end
-        
+
           def editor_for_association
             :combobox
           end
-   
+
           # Returns a hash that maps a column type to the editor xtype. Override if you want different editors.
           def attr_type_to_editor_map
             {
@@ -182,46 +182,44 @@ module Netzke
               :string => :textfield
             }
           end
-      
+
           # Detects an association column and sets up the proper editor.
           def detect_association(c)
             # double-underscore notation? surely an association column
             if c[:name].index('__')
               assoc_name, assoc_method = c[:name].split('__')
-              assoc = data_class.reflect_on_association(assoc_name.to_sym)
-          
-              if assoc && assoc_method
+              if assoc_method && assoc = data_class.reflect_on_association(assoc_name.to_sym)
                 assoc_column = assoc.klass.columns_hash[assoc_method]
                 assoc_method_type = assoc_column.try(:type)
-            
+
                 # if association column is boolean, display a checkbox (or alike), otherwise - a combobox (or alike)
                 c[:editor] ||= assoc_method_type == :boolean ? editor_for_attr_type(:boolean) : editor_for_association
               end
             end
           end
-        
+
           # Default fields that will be displayed in the Add/Edit/Search forms
           def default_fields_for_forms
             form_klass = "Netzke::ModelExtensions::#{config[:model]}ForFormPanel".constantize rescue nil
             form_klass ||= original_data_class
-          
+
             # Select only those fields that are known to the form_klass
             selected_columns = columns.select do |c|
               form_klass.column_names.include?(c[:name]) ||
               form_klass.instance_methods.include?("#{c[:name]}=") ||
               association_attr?(c[:name])
             end
-          
+
             selected_columns.map do |c|
               field_config = {:name => c[:name]}
-            
+
               # scopes for combobox options
               field_config[:scopes] = c[:editor].is_a?(Hash) && c[:editor][:scopes]
-            
+
               field_config
             end
           end
-        
+
           # Receives 2 arrays of columns. Merges the missing config from the +source+ into +dest+, matching columns by name
           def reverse_merge_equally_named_columns(dest, source)
             dest.each{ |dc| dc.reverse_merge!(source.detect{ |sc| sc[:name] == dc[:name] } || {}) }

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

@@ -4,12 +4,12 @@ module Netzke
       # (Dynamic) JavaScript for GridPanel
       module Javascript
         extend ActiveSupport::Concern
-      
+
         included do
           js_base_class "Netzke.pre.GridPanel"
           js_method :init_component, js_init_component
         end
-      
+
         module InstanceMethods
           # The result of this method (a hash) is converted to a JSON object and passed as the configuration parameter
           # to the constructor of our JavaScript class. Override it when you want to pass any extra configuration
@@ -28,7 +28,7 @@ module Netzke
 
         module ClassMethods
           private
-        
+
             # Ext.Component#initComponent, built up from pices (dependent on class-level configuration)
             def js_init_component
               # Optional "edit in form"-related events
@@ -48,7 +48,7 @@ module Netzke
                   }, this);
                 }
               END_OF_JAVASCRIPT
-        
+
               # Result
               <<-END_OF_JAVASCRIPT
                 function(){
@@ -56,13 +56,13 @@ module Netzke
                   #{js_full_class_name}.superclass.initComponent.call(this);
                   #{edit_in_form_events}
                 }
-          
+
               END_OF_JAVASCRIPT
             end
-            
+
           # end private
         end
-      
+
       end
     end
   end

data/{app/components → lib}/netzke/basepack/grid_panel/javascripts/advanced_search.js

@@ -1,18 +1,18 @@
 Ext.override(Netzke.pre.GridPanel, {
   onSearch: function(el){
     el.toggle(el.toggled); // do not toggle immediately
-    
+
     this.loadComponent({name: 'search_form', callback: function(win){
       var currentConditionsString = this.getStore().baseParams.extra_conditions;
       if (currentConditionsString) {
         win.items.first().getForm().setValues(Ext.decode(currentConditionsString));
       }
-      
+
       win.items.first().on('apply', function(){
         win.onSearch();
         return false; // do not propagate the 'apply' event
       }, this);
-      
+
       win.on('close', function(){
         if (win.closeRes == 'OK'){
           var searchConditions = win.conditions;
@@ -30,7 +30,7 @@ Ext.override(Netzke.pre.GridPanel, {
         }
       }, this);
     }, scope: this});
-    
+
     //   delete this.searchWindow;
     //   this.searchWindow = new Ext.Window({
     //     title:'Advanced search',
@@ -52,15 +52,15 @@ Ext.override(Netzke.pre.GridPanel, {
     //     }],
     //     closePositively : function(){
     //       this.conditions = this.getNetzkeComponent().getForm().getValues();
-    //       this.closeRes = 'OK'; 
+    //       this.closeRes = 'OK';
     //       this.close();
     //     },
     //     closeNegatively: function(){
-    //       this.closeRes = 'cancel'; 
+    //       this.closeRes = 'cancel';
     //       this.close();
     //     }
     //   });
-    // 
+    //
     //   this.searchWindow.on('close', function(){
     //     if (this.searchWindow.closeRes == 'OK'){
     //       var searchConditions = this.searchWindow.conditions;
@@ -77,20 +77,20 @@ Ext.override(Netzke.pre.GridPanel, {
     //       this.getStore().load();
     //     }
     //   }, this);
-    // 
+    //
     //   this.searchWindow.on('add', function(container, searchPanel){
     //     searchPanel.on('apply', function(component){
     //       this.searchWindow.closePositively();
     //       return false; // stop the event
     //     }, this);
     //   }, this);
-    // 
+    //
     //   this.searchWindow.show(null, function(){
     //     this.searchWindow.closeRes = 'cancel';
     //     if (!this.searchWindow.getNetzkeComponent()){
     //       this.loadComponent({id:"searchPanel", container:this.searchWindow.id});
     //     }
     //   }, this);
-    // 
+    //
   }
 });

data/{app/components → lib}/netzke/basepack/grid_panel/javascripts/edit_in_form.js

@@ -15,7 +15,7 @@ Ext.override(Netzke.pre.GridPanel, {
             if (!form.baseParams) form.baseParams = {};
             form.baseParams.ids = Ext.encode(ids);
           }, this);
-          
+
           w.on('close', function(){
             if (w.closeRes === "ok") {
               this.store.reload();
@@ -35,7 +35,7 @@ Ext.override(Netzke.pre.GridPanel, {
         }, scope: this});
     }
   },
-  
+
   onAddInForm: function(){
     this.loadComponent({name: "add_form", callback: function(form){
       form.on('close', function(){

data/{app/components → lib}/netzke/basepack/grid_panel/javascripts/pre.js

@@ -1,11 +1,11 @@
-/* 
+/*
   Static part of GridPanel's JavaScript class.
 */
 Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
   trackMouseOver: true,
   loadMask: true,
   autoScroll: true,
-  
+
   initComponent: function(){
     this.plugins = []; // checkbox colums is a special case, being a plugin
 
@@ -31,7 +31,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
       } else {
         c.editor = {xtype: this.attrTypeEditorMap[c.attrType] || 'textfield'}
       }
-      
+
       // if comboboxOptions are provided, we render a combobox instead of textfield
       if (c.comboboxOptions && c.editor.xtype === "textfield") {
         c.editor = {xtype: "combobox", options: c.comboboxOptions.split('\\n')}
@@ -80,7 +80,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
 //                      c.renderer = renderer
 //                    };
 //                  }
-//                
+//
         // add to the list
         // cmConfig.push(c);
       }
@@ -107,7 +107,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
       this.plugins.push(this.ddPlugin);
     }
 
-    // Explicitely create the connection to get grid's data, 
+    // Explicitely create the connection to get grid's data,
     // because we don't want the app-wide Ext.Ajax to be used,
     // as we are going to subscribe to its events
     var connection = new Ext.data.Connection({
@@ -168,10 +168,10 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
     // Now let Ext.grid.EditorGridPanel do the rest
     // Original initComponent
     Netzke.pre.GridPanel.superclass.initComponent.call(this);
-    
+
     // Hidden change event
     if (this.persistentConfig) {this.getColumnModel().on('hiddenchange', this.onColumnHiddenChange, this);}
-    
+
     // Inform the server part about column operations
     if (this.persistentConfig) {
       this.on('columnresize', this.onColumnResize, this);
@@ -243,12 +243,12 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
       // r.set('id', r.id); // otherwise later r.get('id') returns empty string
       this.stopEditing();
       this.getStore().add(r);
-      
+
       // Set default values
       this.getStore().fields.each(function(field){
         r.set(field.name, field.defaultValue);
       });
-      
+
       this.tryStartEditing(this.store.indexOf(r));
     },
 
@@ -283,7 +283,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
           } else {
             updatedRecords.push(Ext.apply(r.getChanges(), {id:r.id}));
           }
-        }, 
+        },
       this);
 
       if (newRecords.length > 0 || updatedRecords.length > 0) {
@@ -292,22 +292,22 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
         if (newRecords.length > 0) {
           params.created_records = Ext.encode(newRecords);
         }
-      
+
         if (updatedRecords.length > 0) {
           params.updated_records = Ext.encode(updatedRecords);
         }
-      
+
         if (this.store.baseParams !== {}) {
           params.base_params = Ext.encode(this.store.baseParams);
         }
-      
+
         this.postData(params);
       }
 
     },
 
   // Handlers for tools
-  // 
+  //
 
   onRefresh: function() {
       if (this.fireEvent('refresh', this) !== false) {
@@ -316,7 +316,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
     },
 
   // Event handlers
-  // 
+  //
 
   onColumnResize: function(index, size){
       this.resizeColumn({
@@ -348,15 +348,15 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
   onRowContextMenu: function(grid, rowIndex, e){
       e.stopEvent();
       var coords = e.getXY();
-    
+
       if (!grid.getSelectionModel().isSelected(rowIndex)) {
         grid.getSelectionModel().selectRow(rowIndex);
       }
-    
+
       var menu = new Ext.menu.Menu({
         items: this.contextMenu
       });
-    
+
       menu.showAt(coords);
     },
 
@@ -369,7 +369,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
     },
 
   // Other methods
-  // 
+  //
 
   loadExceptionHandler: function(proxy, options, response, error){
     if (response.status == 200 && (responseObject = Ext.decode(response.responseText)) && responseObject.flash){
@@ -379,7 +379,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
         this.feedback(error.message);
       } else {
         this.feedback(response.statusText);
-      }  
+      }
     }
   },
 
@@ -403,7 +403,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
         }
         editableIndex++;
       });
-      
+
       if (editableIndex < this.getColumnModel().config.length) {this.startEditing(row, editableIndex);}
     },
 
@@ -430,7 +430,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
       for (var k in records){
         records[k] = this.store.reader.readRecords([records[k]]).records[0];
       }
-    
+
       // for each new record write the data returned by the server, and commit the record
       Ext.each(modRecordsInGrid, function(recordInGrid){
         if (mod ^ recordInGrid.isNew) {
@@ -438,7 +438,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
           var recordId = recordInGrid.id;
           // new data that the server sent us to update this record (identified by the id)
           var newData =  records[recordId];
-        
+
           if (newData){
             for (var k in newData.data){
               recordInGrid.set(k, newData.get(k));
@@ -447,10 +447,10 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
             recordInGrid.isNew = false;
             recordInGrid.commit();
           }
-        
+
         }
       }, this);
-    
+
       // clear the selections
       this.getSelectionModel().clearSelections();
 
@@ -459,7 +459,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
       if (modRecords.length == 0) {
         // if all records are accepted, reload the grid (so that eventual order/filtering is correct)
         this.store.reload();
-      
+
         // ... and set default getRowClass function
         this.getView().getRowClass = this.defaultGetRowClass;
       } else {
@@ -467,7 +467,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
           return r.dirty ? "grid-dirty-record" : ""
         }
       }
-    
+
       this.getView().refresh();
       this.getSelectionModel().fireEvent('selectionchange', this.getSelectionModel());
     },
@@ -481,7 +481,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
       this.getSelectionModel().selectRow(0);
       this.getSelectionModel().resumeEvents();
     },
-  
+
   // Normalizes the renderer for a column.
   // Renderer may be:
   // 1) a string that contains the name of the function to be used as renderer.
@@ -508,7 +508,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
         name = c.renderer[0];
         args = c.renderer.slice(1);
       }
-      
+
       // First check whether Ext.util.Format has it
       if (Ext.isFunction(Ext.util.Format[name])) {
          c.renderer = Ext.util.Format[name].createDelegate(this, args, 1);
@@ -528,7 +528,7 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
       this.tryStartEditing(this.store.indexOf(row));
     }
   }
-  
+
   // :reorder_columns => <<-END_OF_JAVASCRIPT.l,
   //   function(columns){
   //     columnsInNewShipment = [];
@@ -539,5 +539,5 @@ Netzke.pre.GridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
   //     this.store.reader.recordType = newRecordType; // yes, recordType is a protected property, but that's the only way we can do it, and it seems to work for now
   //   }
   // END_OF_JAVASCRIPT
-  
+
 });