netzke-basepack 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30d74b083e48e2a51888f96da8a9bfc2cae04fd6
-  data.tar.gz: 8e2ee2d275266f0edb379c1a5842c2f8e560cdcc
+  metadata.gz: 16a254ce373566ab871dcc25a79c46a1a33e687b
+  data.tar.gz: d46f4ce76ad16ebf476ee48b3f6e60a72a0e30f0
 SHA512:
-  metadata.gz: 23a15c8fad9fd568fb8eba8bbc548e596eed27755f4cd43b01552995a3e24025af4de898ae6e12f31499b5ac805979d3ccab474d2a2a431777553fb629b60647
-  data.tar.gz: 290f1bc27eac9746be1d89eb276e56585861323928a75ecfad8231ecbfa9d40ef628bfed20c55c9566e9df4dafbe75277f164fd9fc6586c8b79cb0b5aecd9c0a
+  metadata.gz: 367b371b71bbbc162f4885d4cb51d81c0e60017485e7cbdc6b5f2c4ed463c8dc115324d1af83c4dcde8de006b1522b509b917714844950cc065aa64bd1fc394d
+  data.tar.gz: 91587317913ba081de7a6320520cc3b830e7a530d69cbdedd08fcd5fe727760d253abbebc02c06556fdd34832a3b173ba86f51800628715e32b18bd708f32aca

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.11.1 - 2015-04-20
+* Fix filtering by association when associtaion method is integer
+* Fix decimal and float columns in extended search form
+* Fix showing 0-value in association shown by integer
+* Fix limited precision in numeric column filter
+
 # 0.11.0 - 2015-02-05
 * Rails 4.2
 * A few fixes from AlexKovynev

data/lib/netzke/basepack/columns.rb

@@ -142,8 +142,6 @@ module Netzke
           {name: c.name, text: c.text, attr_type: c.attr_type}.tap do |a|
             if c[:assoc]
               a[:text].sub!("  ", " ")
-              a[:assoc] = true
-              a[:attr_type] = :string
             end
           end
         end

data/lib/netzke/basepack/data_adapters/active_record_adapter.rb

@@ -39,7 +39,9 @@ module Netzke::Basepack::DataAdapters
     end
 
     def attr_type(attr_name)
-      association_attr?(attr_name) ? :integer : (@model_class.columns_hash[attr_name.to_s].try(:type) || :string)
+      method, assoc = method_and_assoc(attr_name)
+      klass = assoc.nil? ? @model_class : assoc.klass
+      klass.columns_hash[method].try(:type) || :string
     end
 
     # Implementation for {AbstractAdapter#get_records}
@@ -113,17 +115,17 @@ module Netzke::Basepack::DataAdapters
 
     def virtual_attribute?(c)
       assoc_name, asso = c[:name].split('__')
-      assoc, assoc_method = assoc_and_assoc_method_for_attr(c[:name])
+      method, assoc = method_and_assoc(c[:name])
 
       if assoc
-        return !assoc.klass.column_names.include?(assoc_method)
+        return !assoc.klass.column_names.include?(method)
       else
         return !@model_class.column_names.include?(c[:name])
       end
     end
 
     def combo_data(attr, query = "")
-      assoc, assoc_method = assoc_and_assoc_method_for_attr(attr[:name])
+      method, assoc = method_and_assoc(attr[:name])
 
       if assoc
         # Options for an asssociation attribute
@@ -131,16 +133,16 @@ module Netzke::Basepack::DataAdapters
         relation = assoc.klass.all
         relation = relation.extend_with(attr[:scope]) if attr[:scope]
 
-        if assoc.klass.column_names.include?(assoc_method)
+        if assoc.klass.column_names.include?(method)
           # apply query
           assoc_arel_table = assoc.klass.arel_table
 
-          relation = relation.where(assoc_arel_table[assoc_method].matches("%#{query}%"))  if query.present?
-          relation.to_a.map{ |r| [r.id, r.send(assoc_method)] }
+          relation = relation.where(assoc_arel_table[method].matches("%#{query}%"))  if query.present?
+          relation.to_a.map{ |r| [r.id, r.send(method)] }
         else
           query.downcase!
           # an expensive search!
-          relation.to_a.map{ |r| [r.id, r.send(assoc_method)] }.select{ |id,value| value.to_s.downcase.include?(query) }
+          relation.to_a.map{ |r| [r.id, r.send(method)] }.select{ |id,value| value.to_s.downcase.include?(query) }
         end
 
       else
@@ -296,11 +298,12 @@ module Netzke::Basepack::DataAdapters
       end
     end
 
-    # Returns association and association method for a column
-    def assoc_and_assoc_method_for_attr(column_name)
-      assoc_name, assoc_method = column_name.split('__')
-      assoc = @model_class.reflect_on_association(assoc_name.to_sym) if assoc_method
-      [assoc, assoc_method]
+    # If association attribute is given, returns [method, association]
+    # Else returns [attr_name]
+    def method_and_assoc(attr_name)
+      assoc_name, method = attr_name.to_s.split('__')
+      assoc = @model_class.reflect_on_association(assoc_name.to_sym) if method
+      assoc.nil? ? [attr_name] : [method, assoc]
     end
 
     # An ActiveRecord::Relation instance encapsulating all the necessary conditions.
@@ -353,16 +356,10 @@ module Netzke::Basepack::DataAdapters
       predicates = conditions.map do |q|
         q = HashWithIndifferentAccess.new(q)
 
-        assoc, method = q["attr"].split('__')
-        if method
-          assoc = @model_class.reflect_on_association(assoc.to_sym)
-          assoc_arel = assoc.klass.arel_table
-          attr = method
-          arel_table = Arel::Table.new(assoc.klass.table_name.to_sym)
-        else
-          attr = assoc
-          arel_table = @model_class.arel_table
-        end
+        attr = q[:attr]
+        method, assoc = method_and_assoc(attr)
+
+        arel_table = assoc ? Arel::Table.new(assoc.klass.table_name.to_sym) : @model_class.arel_table
 
         value = q["value"]
         op = q["operator"]
@@ -371,15 +368,15 @@ module Netzke::Basepack::DataAdapters
 
         case attr_type
         when :datetime
-          update_predecate_for_datetime(arel_table[attr], op, value.to_date)
+          update_predecate_for_datetime(arel_table[method], op, value.to_date)
         when :string, :text
-          update_predecate_for_string(arel_table[attr], op, value)
+          update_predecate_for_string(arel_table[method], op, value)
         when :boolean
-          update_predecate_for_boolean(arel_table[attr], op, value)
+          update_predecate_for_boolean(arel_table[method], op, value)
         when :date
-          update_predecate_for_rest(arel_table[attr], op, value.to_date)
+          update_predecate_for_rest(arel_table[method], op, value.to_date)
         else
-          update_predecate_for_rest(arel_table[attr], op, value)
+          update_predecate_for_rest(arel_table[method], op, value)
         end
       end
 

data/lib/netzke/basepack/grid.rb

@@ -378,8 +378,6 @@ module Netzke
         # JavaScript includes
         ex = Netzke::Core.ext_path.join("examples")
 
-        c.require :extensions
-
         # Includes for column filters
         if column_filters_available
           [
@@ -392,6 +390,8 @@ module Netzke
             c.require(ex.join"ux/grid/filter/#{f}Filter.js")
           end
         end
+
+        c.require :extensions
       end
 
       # Allows children classes to simply do:

data/lib/netzke/basepack/grid/javascripts/extensions.js

@@ -138,3 +138,14 @@ Ext.override(Ext.ux.CheckColumn, {
     else return this.callOverridden(arguments);
   }
 });
+
+// Fix 2-digit precision in the numeric column filter
+Ext.define('Ext.ux.grid.menu.RangeMenu', {
+  override: 'Ext.ux.grid.menu.RangeMenu',
+  menuItemCfgs : {
+    emptyText: 'Enter Number...',
+    selectOnFocus: false,
+    width: 155,
+    decimalPrecision: 10
+  },
+});

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

@@ -241,7 +241,7 @@
 
       // Setting the default filter type
       if (c.filterable != false && !c.filter) {
-        c.filter = {type: c.assoc ? 'string' : this.netzkeFieldTypeForAttrType(c.attrType)};
+        c.filter = {type: this.netzkeFilterTypeForAttrType(c.attrType)};
       }
 
       // setting dataIndex
@@ -280,6 +280,20 @@
     return Ext.create('Netzke.classes.Basepack.Grid.ArrayReader');
   },
 
+  netzkeFilterTypeForAttrType: function(attrType){
+    var map = {
+      integer   : 'int',
+      decimal   : 'int',
+      float     : 'int',
+      datetime  : 'date',
+      date      : 'date',
+      string    : 'string',
+      text      : 'string',
+      'boolean' : 'boolean'
+    };
+    return map[attrType] || 'string';
+  },
+
   netzkeFieldTypeForAttrType: function(attrType){
     var map = {
       integer   : 'int',
@@ -376,7 +390,8 @@
       if (recordFromStore) {
         renderedValue = recordFromStore.get('text');
       } else if (c.assoc && r.get('meta')) {
-        renderedValue = r.get('meta').associationValues[c.name] || c.emptyText;
+        var assocValue = r.get('meta').associationValues[c.name];
+        renderedValue = (assocValue == undefined) ? c.emptyText : assocValue;
       } else {
         renderedValue = value;
       }

data/lib/netzke/basepack/search_panel.rb

@@ -9,24 +9,24 @@ module Netzke
       i18n_path = "netzke.basepack.search_panel.%s"
 
       ATTRIBUTE_OPERATORS_MAP = {
-        :integer => [
+        integer: [
           ["eq", I18n.t(i18n_path % 'equals')],
           ["gt", I18n.t(i18n_path % 'greater_than')],
           ["lt", I18n.t(i18n_path % 'less_than')]
         ],
-        :text => [
+        text: [
           ["contains", I18n.t(i18n_path % 'contains')] # same as matches => %string%
         ],
-        :string => [
+        string: [
           ["contains", I18n.t(i18n_path % 'contains')], # same as matches => %string%
           ["matches", I18n.t(i18n_path % 'matches')]
         ],
-        :boolean => [
+        boolean: [
           ["is_any", I18n.t(i18n_path % 'is_true')],
           ["is_true", I18n.t(i18n_path % 'is_true')],
           ["is_false", I18n.t(i18n_path % 'is_false')]
         ],
-        :date => [
+        date: [
           ["eq", I18n.t(i18n_path % 'date_equals')],
           ["gt", I18n.t(i18n_path % 'after')],
           ["lt", I18n.t(i18n_path % 'before')],
@@ -36,6 +36,8 @@ module Netzke
       }
 
       ATTRIBUTE_OPERATORS_MAP[:datetime] = ATTRIBUTE_OPERATORS_MAP[:date]
+      ATTRIBUTE_OPERATORS_MAP[:decimal] = ATTRIBUTE_OPERATORS_MAP[:integer]
+      ATTRIBUTE_OPERATORS_MAP[:float] = ATTRIBUTE_OPERATORS_MAP[:integer]
 
       js_configure do |c|
         c.extend = "Ext.form.FormPanel"

data/lib/netzke/basepack/version.rb

@@ -1,5 +1,5 @@
 module Netzke
   module Basepack
-    VERSION = "0.11.0"
+    VERSION = "0.11.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Max Gorin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netzke-core