netzke-basepack 0.7.4 → 0.7.5

data/lib/netzke/basepack/grid_panel/columns.rb

@@ -129,7 +129,7 @@ module Netzke
 
           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 }
+            columns_from_config.insert(0, {:name => data_class.primary_key.to_s}) 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
             # (columns from config have higher priority)
@@ -225,11 +225,10 @@ module Netzke
 
           # Detects an association column and sets up the proper editor.
           def set_default_association_editor(c)
-            assoc, assoc_method = assoc_and_assoc_method_for_attr(c)
+            assoc, assoc_method =  c[:name].split('__')
             return unless assoc
 
-            assoc_column = assoc.klass.columns_hash[assoc_method]
-            assoc_method_type = assoc_column.try(:type)
+            assoc_method_type = data_adapter.get_assoc_property_type assoc, assoc_method
 
             # if association column is boolean, display a checkbox (or alike), otherwise - a combobox (or alike)
             if c[:nested_attribute]
@@ -361,12 +360,12 @@ module Netzke
 
           def columns_default_values
             columns.inject({}) do |r,c|
-              assoc, assoc_method = assoc_and_assoc_method_for_attr(c)
+              assoc_name, assoc_method = c[:name].split '__'
               if c[:default_value].nil?
                 r
               else
-                if assoc
-                  r.merge(assoc.options[:foreign_key] || assoc.name.to_s.foreign_key => c[:default_value])
+                if assoc_method
+                  r.merge(data_adapter.foreign_key_for(assoc_name) || data_adapter.foreign_key_for(assoc_name) => c[:default_value])
                 else
                   r.merge(c[:name] => c[:default_value])
                 end

data/lib/netzke/basepack/grid_panel/javascripts/event_handling.js

@@ -37,38 +37,40 @@
   },
 
   onApply: function(){
-    var newRecords = [],
-        updatedRecords = [],
-        store = this.getStore();
-
-    Ext.each(store.getUpdatedRecords().concat(store.getNewRecords()),
-      function(r) {
-        if (r.isNew) {
-          newRecords.push(r.data); // HACK: r.data seems private
-        } else {
-          updatedRecords.push(Ext.apply(r.getChanges(), {id:r.getId()}));
-        }
-      },
-    this);
+    if (this.fireEvent('apply')) {
+      var newRecords = [],
+          updatedRecords = [],
+          store = this.getStore();
 
-    if (newRecords.length > 0 || updatedRecords.length > 0) {
-      var params = {};
+      Ext.each(store.getUpdatedRecords().concat(store.getNewRecords()),
+        function(r) {
+          if (r.isNew) {
+            newRecords.push(r.data); // HACK: r.data seems private
+          } else {
+            updatedRecords.push(Ext.apply(r.getChanges(), {id:r.getId()}));
+          }
+        },
+      this);
 
-      if (newRecords.length > 0) {
-        params.created_records = Ext.encode(newRecords);
-      }
+      if (newRecords.length > 0 || updatedRecords.length > 0) {
+        var params = {};
 
-      if (updatedRecords.length > 0) {
-        params.updated_records = Ext.encode(updatedRecords);
-      }
+        if (newRecords.length > 0) {
+          params.created_records = Ext.encode(newRecords);
+        }
 
-      if (this.getStore().getProxy().extraParams !== {}) {
-        params.base_params = Ext.encode(this.getStore().getProxy().extraParams);
-      }
+        if (updatedRecords.length > 0) {
+          params.updated_records = Ext.encode(updatedRecords);
+        }
 
-      this.postData(params);
-    }
+        if (this.getStore().getProxy().extraParams !== {}) {
+          params.base_params = Ext.encode(this.getStore().getProxy().extraParams);
+        }
 
+        this.postData(params);
+      }
+    }
+    this.fireEvent('afterApply', this);
   },
 
   // Handlers for tools
@@ -174,4 +176,4 @@
       this.searchWindow.destroy();
     }
   }
-}
+}

data/lib/netzke/basepack/grid_panel/services.rb

@@ -32,7 +32,7 @@ module Netzke
           endpoint :delete_data do |params|
             if !config[:prohibit_delete]
               record_ids = ActiveSupport::JSON.decode(params[:records])
-              data_class.destroy(record_ids)
+              data_adapter.destroy(record_ids)
               on_data_changed
               {:netzke_feedback => I18n.t('netzke.basepack.grid_panel.deleted_n_records', :n => record_ids.size), :load_store_data => get_data}
             else
@@ -83,16 +83,7 @@ module Netzke
           end
 
           endpoint :move_rows do |params|
-            if defined?(ActsAsList) && data_class.ancestors.include?(ActsAsList::InstanceMethods)
-              ids = JSON.parse(params[:ids]).reverse
-              ids.each_with_index do |id, i|
-                r = data_class.find(id)
-                r.insert_at(params[:new_index].to_i + i + 1)
-              end
-              on_data_changed
-            else
-              raise RuntimeError, "Data class should 'acts_as_list' to support moving rows"
-            end
+            data_adapter.move_records(params)
             {}
           end
 
@@ -155,12 +146,8 @@ module Netzke
           if !config[:prohibit_read]
             {}.tap do |res|
               records = get_records(params)
-              res[:data] = records.map{|r| r.to_array(columns(:with_meta => true))}
-              res[:total] = records.total_entries if config[:enable_pagination]
-
-              # provide association values for all records at once
-              # assoc_values = get_association_values(records, columns)
-              # res[:set_association_values] = assoc_values.literalize_keys if assoc_values.present?
+              res[:data] = records.map{|r| r.netzke_array(columns(:with_meta => true))}
+              res[:total] = count_records(params)  if config[:enable_pagination]
             end
           else
             flash :error => "You don't have permissions to read data"
@@ -170,68 +157,18 @@ module Netzke
 
         protected
 
-          # Returns all values for association columns, per column, per associated record id, e.g.:
-          # {
-          #   :author__first_name => {1 => "Vladimir", 2 => "Herman"},
-          #   :author__last_name => {1 => "Nabokov", 2 => "Hesse"}
-          # }
-          # This is used to display the association by the specified method instead by the foreign key
-          # def get_association_values(records, columns)
-          #   columns.select{ |c| c[:name].index("__") }.each.inject({}) do |r,c|
-          #     column_values = {}
-          #     records.each{ |r| column_values[r.value_for_attribute(c)] = r.value_for_attribute(c, true) }
-          #     r.merge(c[:name] => column_values)
-          #   end
-          # end
-
           # Returns an array of records.
           def get_records(params)
+            params[:limit] = config[:rows_per_page] if config[:enable_pagination]
+            params[:scope] = config[:scope] # note, params[:scope] becomes ActiveSupport::HashWithIndifferentAccess
 
-            # Restore params from component_session if requested
-            if params[:with_last_params]
-              params = component_session[:last_params]
-            else
-              # remember the last params
-              component_session[:last_params] = params
-            end
-
-            # build initial relation based on passed params
-            relation = get_relation(params)
+            data_adapter.get_records(params, columns)
+          end
 
-            # addressing the n+1 query problem
-            columns.each do |c|
-              assoc, method = c[:name].split('__')
-              relation = relation.includes(assoc.to_sym) if method
-            end
+          def count_records(params)
+            params[:scope] = config[:scope] # note, params[:scope] becomes ActiveSupport::HashWithIndifferentAccess
 
-            # apply sorting if needed
-            if params[:sort] && sort_params = params[:sort].first
-              assoc, method = sort_params["property"].split('__')
-              dir = sort_params["direction"].downcase
-
-              # if a sorting scope is set, call the scope with the given direction
-              column = columns.detect { |c| c[:name] == sort_params["property"] }
-              if column.has_key?(:sorting_scope)
-                relation = relation.send(column[:sorting_scope].to_sym, dir.to_sym)
-                ::Rails.logger.debug "!!! relation: #{relation.inspect}\n"
-              else
-                relation = if method.nil?
-                  relation.order("#{assoc} #{dir}")
-                else
-                  assoc = data_class.reflect_on_association(assoc.to_sym)
-                  relation.joins(assoc.name).order("#{assoc.klass.table_name}.#{method} #{dir}")
-                end
-              end
-            end
-
-            # apply pagination if needed
-            if config[:enable_pagination]
-              per_page = config[:rows_per_page]
-              page = params[:limit] ? params[:start].to_i/params[:limit].to_i + 1 : 1
-              relation.paginate(:per_page => per_page, :page => page)
-            else
-              relation.all
-            end
+            data_adapter.count_records(params, columns)
           end
 
           # Override this method to react on each operation that caused changing of data
@@ -258,7 +195,7 @@ module Netzke
               modified_records = 0
               data.each do |record_hash|
                 id = record_hash.delete('id')
-                record = operation == :create ? data_class.new : data_class.find(id)
+                record = operation == :create ? data_adapter.new_record : data_adapter.find_record(id)
                 success = true
 
                 # merge with strong default attirbutes
@@ -268,21 +205,8 @@ module Netzke
                   record.set_value_for_attribute(columns_hash[k.to_sym].nil? ? {:name => k} : columns_hash[k.to_sym], v)
                 end
 
-                # process all attirubutes for this record
-                #record_hash.each_pair do |k,v|
-                  #begin
-                    #record.send("#{k}=",v)
-                  #rescue ArgumentError => exc
-                    #flash :error => exc.message
-                    #success = false
-                    #break
-                  #end
-                #end
-
                 # try to save
-                # modified_records += 1 if success && record.save
-                mod_records[id] = record.to_array(columns(:with_meta => true)) if success && record.save
-                # mod_record_ids << id if success && record.save
+                mod_records[id] = record.netzke_array(columns(:with_meta => true)) if success && record.save
 
                 # flash eventual errors
                 if !record.errors.empty?
@@ -292,7 +216,6 @@ module Netzke
                   end
                 end
               end
-              # flash :notice => "#{operation.to_s.capitalize}d #{modified_records} record(s)"
             else
               success = false
               flash :error => "You don't have permissions to #{operation} data"

data/lib/netzke/basepack/paging_form_panel.rb

@@ -23,7 +23,7 @@ module Netzke
 
       # override
       def record
-        @record ||= get_relation.first
+        @record ||= data_adapter.first
       end
 
       # Pass total records amount and the first record to the JS constructor
@@ -34,7 +34,7 @@ module Netzke
       end
 
       endpoint :get_data do |params|
-        @record = get_relation(params).offset(params[:start].to_i).limit(1).first
+        @record = data_adapter.get_records(params).first
         record_hash = @record && js_record_data
         {:records => record_hash && [record_hash] || [], :total => total_records(params)}
       end
@@ -64,7 +64,7 @@ module Netzke
       protected
 
         def total_records(params = {})
-          @total_records ||= get_relation(params).count
+          @total_records ||= data_adapter.count_records(params, [])
         end
 
     end

data/lib/netzke/basepack/query_builder.rb

@@ -13,6 +13,7 @@ module Netzke
         {
           :class_name => "Netzke::Basepack::SearchPanel",
           :model => config[:model],
+          :fields => config[:fields],
           :preset_query => config[:query],
           :auto_scroll => config[:auto_scroll]
         }
@@ -63,6 +64,7 @@ module Netzke
           s[:bbar] = (config[:bbar] || []) + [:clear_all.action, :reset.action, "->",
             I18n.t('netzke.basepack.query_builder.presets'),
             {
+              :itemId => "presetsCombo",
               :xtype => "combo",
               :triggerAction => "all",
               :value => super[:load_last_preset] && last_preset.try(:fetch, "name"),

data/lib/netzke/basepack/query_builder/javascripts/query_builder.js

@@ -2,18 +2,20 @@
   initComponent: function() {
     this.callParent();
 
+    this.presetsCombo = this.getDockedItems()[1].getComponent('presetsCombo');
+
     this.add({title: "+"});
 
     this.on('beforetabchange', function(c, newTab, curentTab){
       if (newTab.title === '+') {
-        this.addTab(true);
+        this.addTab(true, true);
         return false;
       } else {
         if (this.maxTabHeight) newTab.setHeight(this.maxTabHeight);
       }
     }, this);
 
-    this.addTab(true);
+    this.addTab(true, false);
 
     this.addEvents('conditionsupdate');
 
@@ -24,22 +26,31 @@
 
     if (query.length !== 0) {
       Ext.each(query, function(f, i){
-        if (this.items.getCount() < i + 2) { this.addTab(); }
-        this.items.get(i).buildFormFromQuery(query[i]);
+        var closable = i === 0 ? false : true;
+        if (this.items.getCount() < i + 2) { this.addTab(false, closable); }
+          this.items.get(i).items.first().buildFormFromQuery(query[i]);
       }, this);
     }
 
     this.doLayout();
   },
 
-  addTab: function(activate){
+  addTab: function(activate, closable){
     var newTabConfig = Ext.apply({}, this.netzkeComponents.searchPanel);
     newTabConfig.id = Ext.id(); // We need a unique ID every time
-    newTabConfig.title = "OR";
-    newTabConfig.closable = true;
-    var newTab = Ext.createByAlias(newTabConfig.alias, newTabConfig);
-
-    this.insert(this.items.getCount() - 1, newTab);
+    newTabConfig.preventHeader = true;
+    newTabConfig.border = false;
+
+    var newTab = this.insert(
+      this.items.getCount() - 1,
+      {
+        title: "OR",
+        closable: closable,
+        items: [
+          Ext.createByAlias(newTabConfig.alias, newTabConfig)
+        ]
+      }
+    );
 
     if (activate) {
       this.suspendEvents();
@@ -51,8 +62,8 @@
   getQuery: function(all) {
     var query = [];
     this.eachTab(function(i) {
-      var q = i.getQuery();
-      if (q.length > 0) query.push(i.getQuery(all));
+      var q = i.items.first().getQuery();
+      if (q.length > 0) query.push(i.items.first().getQuery(all));
     });
     return query;
   },
@@ -66,8 +77,8 @@
   },
 
   eachTab: function(fn, scope) {
-    this.items.each(function(f, i) {
-      if (this.items.last() !== f) {
+    this.items.each(function(f) {
+      if (f.title !== "+") {
         fn.call(scope || f, f);
       }
     }, this);
@@ -75,7 +86,7 @@
 
   onClearAll: function() {
     this.removeAllTabs(true);
-    this.items.first().onClearAll();
+    this.getActiveTab().items.first().onClearAll();
   },
 
   onReset: function() {
@@ -94,7 +105,7 @@
       var existingPresetIndex = presetsComboStore.find('field2', searchName);
       if (existingPresetIndex !== -1) {
         // overwriting
-        Ext.Msg.confirm(this.i18n.overwriteConfirmTitle, String.format(this.i18n.overwriteConfirm, searchName), function(btn, text){
+        Ext.Msg.confirm(this.i18n.overwriteConfirmTitle, this.i18n.overwriteConfirm, function(btn, text){
           if (btn == 'yes') {
             var r = presetsComboStore.getAt(existingPresetIndex);
             r.set('field1', this.getQuery(true));
@@ -104,8 +115,7 @@
         }, this);
       } else {
         this.doSavePreset(searchName);
-        var r = new presetsComboStore.recordType({field1: this.getQuery(true), field2: searchName});
-        presetsComboStore.add(r);
+        presetsComboStore.add({field1: this.getQuery(true), field2: searchName});
       }
     }
   },
@@ -120,7 +130,7 @@
   onDeletePreset: function(){
     var searchName = this.presetsCombo.getRawValue();
     if (searchName !== "") {
-      Ext.Msg.confirm(this.i18n.deleteConfirmTitle, String.format(this.i18n.overwriteConfirm, searchName), function(btn, text){
+      Ext.Msg.confirm(this.i18n.deleteConfirmTitle, this.i18n.overwriteConfirm, function(btn, text){
         if (btn == 'yes') {
           this.removePresetFromList(searchName);
           this.deletePreset({

data/lib/netzke/basepack/search_panel.rb

@@ -4,6 +4,8 @@ module Netzke
     # +load_last_preset+ - on load, tries to load the latest saved preset
     class SearchPanel < Base
 
+      include Netzke::Basepack::DataAccessor
+
       js_base_class "Ext.form.FormPanel"
 
       js_properties(
@@ -56,14 +58,15 @@ module Netzke
       def js_config
         super.merge(
           :attrs => attributes,
-          :attrs_hash => data_class.column_names.inject({}){ |hsh,c| hsh.merge(c => data_class.columns_hash[c].type) },
+          :attrs_hash => data_class.column_names.inject({}){ |hsh,c| 
+            hsh.merge(c => data_adapter.get_property_type(data_class.columns_hash[c])) },
           :preset_query => (config[:load_last_preset] ? last_preset.try(:fetch, "query") : config[:query]) || []
         )
       end
 
       def attributes
-        data_class.column_names.map do |name|
-          [name, data_class.human_attribute_name(name)]
+        config[:fields].map do |field|
+          [field[:name], field[:field_label]]
         end
       end