netzke-basepack 0.12.5 → 0.12.6

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+# 0.12.6 - 2015-07-11
+* Regression: show cell editor on adding/editing a record in grid
+* Fix occasional autoload-related problems
+
 # 0.12.5 - 2015-07-07
 * Fix potential problems caused by changing window.id on deleting grid records
-*
+
 # 0.12.4 - 2015-06-22
 * Remove (broken) `load_inline_data` option
 

data/javascripts/columns.js

@@ -182,16 +182,11 @@ Ext.define("Netzke.mixins.Basepack.Columns", {
 
   // Tries editing the first editable (i.e. not hidden, not read-only) sell
   netzkeTryStartEditing: function(r){
-    var editableIndex = 0;
-    Ext.each(this.initialConfig.columns, function(c){
-      // skip columns that cannot be edited
-      if (!(c.hidden == true || !c.editor || c.attrType == 'boolean')) {
-        return false;
-      }
-      editableIndex++;
+    var column = Ext.Array.findBy(this.columns, function(c){
+      return !(c.hidden || c.readOnly || c.attrType == 'boolean')
     });
 
-    if (editableIndex < this.initialConfig.columns.length) {this.getPlugin('celleditor').startEdit(r, this.columns[editableIndex]);}
+    if (column) {this.getPlugin('celleditor').startEdit(r, column);}
   },
 
   netzkeFilterTypeForAttrType: function(attrType){

data/lib/netzke-basepack.rb

@@ -2,18 +2,18 @@
 require 'netzke-core'
 require 'active_support/dependencies'
 
-# Make components auto-loadable
-ActiveSupport::Dependencies.autoload_paths << File.dirname(__FILE__)
-
 require 'netzke/basepack'
 
 module Netzke
   module Basepack
-    class Engine < Rails::Engine
+    class Engine < ::Rails::Engine
 
       %w[en de ru es].each do |lang|
         I18n.load_path << File.dirname(__FILE__) + "/../locales/#{lang}.yml"
       end
+
+      # Make components and modules auto-loadable
+      config.autoload_paths << File.dirname(__FILE__)
     end
   end
 end

data/lib/netzke/basepack/columns.rb

@@ -54,7 +54,7 @@ module Netzke
           has_primary_column = false
 
           columns.each do |c|
-            c = ColumnConfig.new(c, data_adapter)
+            c = Netzke::Basepack::ColumnConfig.new(c, data_adapter)
 
             # merge with column declaration
             send(:"#{c.name}_column", c) if respond_to?(:"#{c.name}_column")
@@ -106,7 +106,7 @@ module Netzke
       def insert_primary_column(cols)
         primary_key = data_adapter.primary_key
         raise "Model #{data_adapter.model_class.name} does not have a primary column" if primary_key.blank?
-        c = ColumnConfig.new(data_adapter.primary_key, data_adapter)
+        c = Netzke::Basepack::ColumnConfig.new(data_adapter.primary_key, data_adapter)
         send(:"#{c.name}_column", c) if respond_to?(:"#{c.name}_column")
         augment_column_config(c)
         cols.insert(0, c)

data/lib/netzke/basepack/fields.rb

@@ -39,7 +39,7 @@ module Netzke
       end
 
       def extend_field(field)
-        FieldConfig.new(field, data_adapter).tap do |c|
+        Netzke::Basepack::FieldConfig.new(field, data_adapter).tap do |c|
 
           # not binding to a model attribute
           return c if c.no_binding

data/lib/netzke/basepack/version.rb

@@ -1,5 +1,5 @@
 module Netzke
   module Basepack
-    VERSION = "0.12.5"
+    VERSION = "0.12.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netzke-core