netzke-basepack 1.0.0.1 → 1.0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17d0bd6e0726aa0b3f85371b133cf6fb26681725
-  data.tar.gz: f267c481ea25fa5704236a1b0468d01a1a3f7f1b
+  metadata.gz: bf5c58faf416227bdbc8e57fce202ba5bfe073fc
+  data.tar.gz: ab2ba7342fca7c413795685800526343e842b1ee
 SHA512:
-  metadata.gz: c9930275347cfe17caa4425f00c193b6b01fd8c17c79f5dd3811b53c45fa1fd4fd0519b8e4a9203c70db4de3fb061b655ea0e5cba20992bebddb792aa0772bc4
-  data.tar.gz: f5a96607236e83fb049f6fe5094e790865cec6c2950f76b2a98374d844ba5bb31d6b7ef820b0813002677d9b4fbb5f726dcfa07ff2a10d8e5022564139507a9c
+  metadata.gz: 53de795fda7f1aa8d96802d4ddfd71a418961acbd6433d0d8398355c5566496f1cf00548a49fbf4fea525278762f7b84fca726fd771ab0c50f18dc08505f96e6
+  data.tar.gz: a1519277e2ec6d997b644adece7268ab1b84db4a13d19f9faac72e516d55670afce629fb4220354a5f94ed532096b894eed79f853be470a3840f484e54e64ac1

data/CHANGELOG.md

@@ -1,105 +1,28 @@
-# v1.0.0.1 - 2016-03-07
-
-*   Grid: fix showing validation errors on inline update
-
-    *Mike (firemind)*
-
-# v1.0.0.0 - 2016-01-04
-
-## Components changed/renamed
-
-*   Base classes of main componens have been renamed from `Netzke::Basepack::{Grid|Form|Tree|Window|Viewport}` to `Netzke::{Grid|Form|Tree|Window|Viewport}::Base`.
-
-*   `Netzke::Basepack::TabPanel` and `Netzke::Basepack::Accordion` have been removed. The only purpose for them was dynamic loading of child components, which didn't prove that useful.
-
-## Form, Grid, Tree
-
-### Breaking changes
-
-*   `strong_default_attrs` config option has been renamed to `strong_values`.
-
-*   `attr_type` config option for columns/fields has been renamed to `type`.
-
-*   The new `attribute` DSL method and the accompanying `attribute_overrides` config option allow reconfiguring the way specific model attributes are presented by both the grid and the form. The `column` DSL method has been left for configuring what's specific for a column. For details, see [Netzke::Basepack::Attributes](http://www.rubydoc.info/github/netzke/netzke-basepack/Netzke/Basepack/Attributes).
-
-*   `data_adapter` method has been renamed to `model_adapter`
-
-*   `model_class` method in `AbstractAdapter` has been renamed to `model`
-
-## Form
-
-### Breaking changes
-
-*   The `netzkeSubmit` and `netzkeLoad` endpoints have been renamed to `submit` and `load` respectively; keep this in mind if you override them in your app.
-
-## Grid
+# v1.0.1.0 - 2016-05-01
 
 ### Breaking changes
 
-*   Column/field label for association no longer includes association method name by default. For example, for
-    `author__name` attribute it'll now be "Author", not "Author  name".
-
-*   `preconfigure_record_window` has been renamed to `configure_form_window`
-
-*   The `default_fields_for_forms` method has been renamed to `default_form_items`.
-
-*   The `data_store` config option has been renamed to `store_config`.
-
-*   Permissions configuration got consolidated into single `permissions` config option. See [Netzke::Grid::Base](http://www.rubydoc.info/github/netzke/netzke-basepack/Netzke/Grid/Base)
-
-*   The `del` action has been renamed to `delete`.
-
-*   Columns configuration (by using the `Grid.column` DSL method, or the `columns` configuration option) no longer has effect on corresponding form fields. Use the new `attribute` DSL method or the `attribute_overrides` config option (see above) to set the common configuration option for both column and form field.
-
-*   Virtual columns declared with the `column` DSL method are no longer automatically appended to the end of the column
-    list; use the `columns` config option or override the `Grid#columns` method to explicitely list them.
-
-*   The endpoints dropped their prefix `server`; additionally, `serverDelete` has become `destroy`; keep this in mind if you override endpoints in your app.
-
-*   All scope-related configs (including those of the columns) now only accept a Proc or a Hash.
-
-*   Class-level component configuration is gone (its sole purpose was to allow reducing the amount of generated JS code - not worth it).
-
-*   `enable_edit_in_form`, `enable_edit_inline`, `enable_pagination` options are gone.
-
-*   `enable_extended_search` option is gone.
-
-### I18n
-
-*   Before to localize association attribute it was needed to specify the attribute in the doubre-underscore notation,
-    for example:
-
-
-        es:
-          activerecord:
-            attributes:
-              book:
-                author__name: Autor
-
-    Now it should be cut down to the association name:
-
-        es:
-          activerecord:
-            attributes:
-              book:
-                author: Autor
+*   Grid, Tree: use the `attributes` config option if you need to configure what attributes are shown in both the grid
+    and its forms. The `columns` config option now only takes effect on grid, and it doesn't modify the layout of its
+    forms.
 
-### New and improved
+*   `edit_inline` config option is gone (see the new `editing` option).
 
-*   By default, Grid now uses form to add/edit records. Set `edit_inline` to true to use inline editing when possible (implicitly sets `paging` to `true`).
+*   Provide full association name using the double-underscore notation in locales (e.g. `author__name` instead of just
+    `author`). This reverts the change introduced in 1.0.0.0.
 
-*   By default, Grid now handles large number of records by using a buffered store (allows for "infinite scrolling"). Set `paging` to `true` if you want pagination instead.
+### New and mproved
 
-*   The toolbar was reduced to 'add', 'edit', 'delete', and 'search' buttons by default. Additionally, the 'apply' button is added when `edit_inline` is set to `true`.
+*   Grid: new `paging` and `editing` options allow for more flexible combinations of different editing and paging modes.
 
-*   Buttons previously disabled due to permissions are now not added to the bottom bar alltogether.
+*   Tree: fixed date and datetime columns in some browsers.
 
-*   Override new `configure_form` method to specify extra configuration to the forms
+*   Tree: implement `scope` config option for Tree.
 
-*   Warn the user at an attempt to change the page when there are unapplied changes; disable the warning by setting `disable_dirty_page_warning` to `true`.
+*   Fix bug that allowed editing grids in inline mode by dblclicking the rows.
 
-*   Proper support for decimal datatype was added
+*   Fix bug that allowed toggling checkbox in grids with prohibited update.
 
-*   Multiediting of reconds now works properly with boolean fields (a tristate selector was implemented).
+*   Explicitly speficying grid actions will no longer display the buttons, whose actions are not permitted.
 
-Please check [0-12](https://github.com/netzke/netzke-basepack/blob/0-12/CHANGELOG.md) for previous changes.
+Please check [1-0-0](https://github.com/netzke/netzke-basepack/blob/1-0-0/CHANGELOG.md) for previous changes.

data/javascripts/grid/columns.js

@@ -174,7 +174,10 @@ Ext.define("Netzke.Grid.Columns", {
       return !(c.hidden || c.readOnly || c.type == 'boolean')
     });
 
-    if (column) {this.getPlugin('celleditor').startEdit(r, column);}
+    if (column) {
+      this.getPlugin('celleditor').startEdit(r, column);
+      var a = this.getPlugin('celleditor').editing;
+    }
   },
 
   netzkeFilterTypeForAttrType: function(type){
@@ -203,5 +206,10 @@ Ext.define("Netzke.Grid.Columns", {
       'boolean' : 'boolean'
     };
     return map[type] || 'string';
+  },
+
+  netzkePermits: function(operation) {
+    var permissions = this.permissions || {};
+    return permissions[operation] != false;
   }
 });

data/javascripts/grid/event_handlers.js

@@ -5,7 +5,7 @@
 Ext.define("Netzke.Grid.EventHandlers", {
   // Handler for the 'add' button
   netzkeOnAdd: function(){
-    if (!this.editInline) {
+    if (this.editing == 'in_form') {
       this.netzkeOnAddInForm();
     } else {
       // Note: default values are taken from the model's field's defaultValue property
@@ -92,6 +92,15 @@ Ext.define("Netzke.Grid.EventHandlers", {
     }
   },
 
+  netzkeOnEditInForm: function(){
+    var selection = this.getSelectionModel().getSelection();
+    if (selection.length == 1) {
+      this.doEditInForm(selection[0]);
+    } else {
+      this.doMultiEdit(selection);
+    }
+  },
+
   netzkeOnAddInForm: function(){
     this.netzkeLoadComponent("add_window", {
       callback: function(w) {
@@ -105,9 +114,9 @@ Ext.define("Netzke.Grid.EventHandlers", {
     });
   },
 
-  // Edit single record
+  // Edit single record using default mode
   doEdit: function(record){
-    if (this.editInline) {
+    if (this.editsInline) {
       this.doEditInline(record);
     } else {
       this.doEditInForm(record);
@@ -178,6 +187,7 @@ Ext.define("Netzke.Grid.EventHandlers", {
   netzkeSetActionEvents: function(){
     this.getSelectionModel().on('selectionchange', function(selModel, selected){
       if (this.actions.delete) this.actions.delete.setDisabled(selected.length == 0);
+
       if (this.actions.edit) {
         var disabled = false;
         Ext.each(selected, function(r){
@@ -185,6 +195,10 @@ Ext.define("Netzke.Grid.EventHandlers", {
         });
         this.actions.edit.setDisabled(selected.length == 0 || disabled);
       }
+
+      if (this.actions.editInForm) {
+        this.actions.editInForm.setDisabled(selected.length == 0);
+      }
     }, this);
   },
 
@@ -193,7 +207,7 @@ Ext.define("Netzke.Grid.EventHandlers", {
    * @method netzkeHandleItemdblclick
    */
   netzkeHandleItemdblclick: function(view, record){
-    if (this.editInline) return;
+    if (this.editsInline) return; // inline editing is handled elsewhere
 
     if ((this.permissions || {}).update !== false) {
       this.doEditInForm(record);
@@ -209,4 +223,17 @@ Ext.define("Netzke.Grid.EventHandlers", {
       Netzke.warning("Undefined handler '"+handlerName+"'");
     }
   },
+
+  netzkeHandleBeforeEdit: function(_, field){
+    return this.netzkePermitInlineEdit(field.record);
+  },
+
+  /**
+   * Whether given record can be edited
+   * @method netzkePermitInlineEdit
+   * @return {Boolean}
+   */
+  netzkePermitInlineEdit: function(record) {
+    return this.editsInline && (this.netzkePermits('update') || !!record.isNew);
+  }
 });

data/lib/netzke/basepack/attr_config.rb

@@ -32,11 +32,7 @@ module Netzke
     private
 
       def default_label
-        if association?
-          @model_adapter.human_attribute_name(name.split("__").first)
-        else
-          @model_adapter.human_attribute_name(name)
-        end
+        @model_adapter.human_attribute_name(name)
       end
 
       def responded_to_by_model?

data/lib/netzke/basepack/attributes.rb

@@ -43,8 +43,28 @@ module Netzke
     #        component :roles
     #      end
     #
+    # Another way to override attributes is by overriding the +augment_attribute_config+ method:
+    #
+    #      class Users < Netzke::Grid::Base
+    #        def configure(c)
+    #          super
+    #          c.model = User
+    #        end
+    #
+    #        def augment_attribute_config(c)
+    #          super
+    #          c.read_only = true if [:address, :salary].include?(c.name)
+    #        end
+    #      end
+    #
     # The following attribute config options are available:
     #
+    # [label]
+    #
+    #   Field label and/or column title used for this attribute. Defaults to
+    #   `ActiveRecord::Base.human_attribute_name(attribute)`, which means that this value will be localized according to
+    #   Rails conventions.
+    #
     # [read_only]
     #
     #   A boolean that defines whether the attribute should be editable via grid/form.
@@ -156,11 +176,17 @@ module Netzke
         end
       end
 
+      # Returns the list of (non-normalized) attributes to be used.
+      # Can be overridden.
+      def attributes
+        config.attributes || model_adapter.model_attributes
+      end
+
       def attribute_overrides
         return @attribute_overrides if @attribute_overrides
 
-        declared = self.class.declared_attribute_names.reduce({}) do |res, name|
-          c = AttributeConfig.new(name)
+        declared = (attributes | self.class.declared_attribute_names).reduce({}) do |res, name|
+          c = Netzke::Basepack::AttrConfig.new(name, model_adapter)
           augment_attribute_config(c)
           res.merge!(name => c)
         end
@@ -168,8 +194,17 @@ module Netzke
         @attribute_overrides = (config.attribute_overrides || {}).deep_merge(declared)
       end
 
+      # Extends passed column config with DSL declaration for this column
+      def apply_attribute_dsl(c)
+        method_name = ATTRIBUTE_METHOD_NAME % c.name
+        send(method_name, c) if respond_to?(method_name)
+      end
+
+      # Receives a +Netzke::Basepack::AttrConfig+ with minimum attribute configuration and extends it according to the
+      # attribute's type. May be overridden.
       def augment_attribute_config(c)
-        send(ATTRIBUTE_METHOD_NAME % c.name, c)
+        apply_attribute_dsl(c)
+        c.set_defaults
       end
 
       def association_attr?(attr)

data/lib/netzke/basepack/columns.rb

@@ -71,7 +71,7 @@ module Netzke
       # Returns the list of (non-normalized) columns to be used. By default returns the list of model column names and declared columns.
       # Can be overridden.
       def columns
-        config.columns || model_adapter.model_attributes
+        config.columns || attributes
       end
 
       # An array of complete columns configs ready to be passed to the JS side.
@@ -79,8 +79,8 @@ module Netzke
         @final_columns ||= [].tap do |cols|
           has_primary_column = false
 
-          columns.each do |c|
-            c = build_column_config(c)
+          columns.each do |name|
+            c = build_column_config(name)
             next if c.excluded
 
             has_primary_column ||= c.primary?
@@ -92,8 +92,8 @@ module Netzke
         end
       end
 
-      def build_column_config(c)
-        Netzke::Basepack::ColumnConfig.new(c, model_adapter).tap do |c|
+      def build_column_config(name)
+        Netzke::Basepack::ColumnConfig.new(name, model_adapter).tap do |c|
           attribute_config = attribute_overrides[c.name.to_sym]
           c.merge_attribute(attribute_config) if attribute_config
           augment_column_config(c)
@@ -112,11 +112,10 @@ module Netzke
 
       # Columns that have to be used by the JS side of the grid
       def js_columns
-        final_columns.map do |c|
+        final_columns.each do |c|
           # we are removing the editor on this last step, so that the editor config is still being passed from the
           # column config to the form editor; refactor!
-          c.delete(:editor) unless config.edit_inline
-          c
+          c.delete(:editor) unless config.edits_inline
         end
       end
 
@@ -142,7 +141,7 @@ module Netzke
 
       # Default form items (non-normalized) that will be displayed in the Add/Edit forms
       def default_form_items
-        non_meta_columns.map{|c| c.name.to_sym}
+        attributes
       end
 
       # ATM the same attributes are used as in forms
@@ -156,7 +155,7 @@ module Netzke
         end
       end
 
-      # Form items that will be used by the Add/Edit forms. May be useful overriding it.
+      # Form items that will be used by the Add/Edit forms. May be overridden.
       def form_items
         config.form_items || default_form_items
       end
@@ -197,15 +196,8 @@ module Netzke
         send(method_name, c) if respond_to?(method_name)
       end
 
-      # Based on initial column config, e.g.:
-      #
-      #   {:name=>"author__name", :type=>:string}
-      #
-      # augment it with additional configuration params, e.g.:
-      #
-      #   {:name=>"author__name", :type=>:string, :editor=>{:xtype=>:netzkeremotecombo}, :assoc=>true, :virtual=>true, :header=>"Author", :sortable=>false, :filterable=>false}
-      #
-      # It may be handy to override it.
+      # Receives a +Netzke::Basepack::ColumnConfig+ with minimum column configuration and extends it according to the
+      # attribute's type. May be overridden.
       def augment_column_config(c)
         apply_column_dsl(c)
         c.set_defaults

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

@@ -230,12 +230,12 @@ module Netzke::Basepack::DataAdapters
       model.root
     end
 
-    def find_record_children(r)
-      r.children
+    def find_record_children(r, scope = nil)
+      extend_relation_with_scope(r.children, scope)
     end
 
-    def find_root_records
-      model.where(parent_id: nil)
+    def find_root_records(scope = nil)
+      extend_relation_with_scope(model.where(parent_id: nil), scope)
     end
 
     # Does record respond to given method?

data/lib/netzke/basepack/fields.rb

@@ -6,7 +6,7 @@ module Netzke
 
       # Items with normalized fields (i.e. containing all the necessary attributes needed by Ext.form.Form to render a field)
       def items
-        prepend_primary_key(config.items) || model_adapter.model_attributes
+        prepend_primary_key(config.items || attributes)
       end
 
       # Hash of fully configured fields, that are referenced in the items. E.g.:

data/lib/netzke/basepack/version.rb

@@ -1,5 +1,5 @@
 module Netzke
   module Basepack
-    VERSION = "1.0.0.1"
+    VERSION = "1.0.1.0"
   end
 end

data/lib/netzke/grid/actions.rb

@@ -6,25 +6,41 @@ module Netzke
       included do
         action :add do |a|
           a.icon = :add
+          a.excluded = !has_add_action?
+        end
+
+        action :add_in_form do |a|
+          a.icon = :application_form_add
+          a.excluded = !has_add_in_form_action?
         end
 
         action :edit do |a|
-          a.disabled = true # initial
+          a.disabled = true # initially
           a.icon = :table_edit
+          a.excluded = !has_edit_action?
         end
 
         action :delete do |a|
-          a.disabled = true # initial
+          a.disabled = true # initially
           a.icon = :table_row_delete
+          a.excluded = !has_delete_action?
         end
 
         action :apply do |a|
           a.icon = :tick
+          a.excluded = !has_apply_action?
         end
 
         action :search do |a|
           a.enable_toggle = true
           a.icon = :magnifier
+          a.excluded = !has_search_action?
+        end
+
+        action :edit_in_form do |a|
+          a.disabled = true # initially
+          a.icon = :application_form_edit
+          a.excluded = !has_edit_in_form_action?
         end
       end
 
@@ -32,12 +48,20 @@ module Netzke
         allowed_to?(:create)
       end
 
+      def has_add_in_form_action?
+        allowed_to?(:create) && config.editing == :both
+      end
+
       def has_edit_action?
         allowed_to?(:update)
       end
 
+      def has_edit_in_form_action?
+        allowed_to?(:update) && config.editing == :both
+      end
+
       def has_apply_action?
-        config.edit_inline && (allowed_to?(:create) || allowed_to?(:update))
+        config.edits_inline && (allowed_to?(:create) || allowed_to?(:update))
       end
 
       def has_delete_action?

data/lib/netzke/grid/base.rb

@@ -24,35 +24,55 @@ module Netzke
     #   Name of the ActiveRecord model that provides data to this Grid (e.g. "User") or the model's class (e.g. User).
     #   Required.
     #
-    # [columns]
+    # [attributes]
     #
-    #   Explicit list of columns to be displayed in the grid; each column may be represented by a symbol (attribute name),
-    #   or a hash, which contains the +name+ key pointing to the attribute name and additional configuration keys (see
-    #   the "Configuring attributes" section below). For example:
+    #   Explicit list of attributes to be displayed in the grid and its forms; each attribute may be represented by a
+    #   symbol (attribute name), or a hash, which contains the +name+ key pointing to the attribute name and additional
+    #   configuration keys (see the "Configuring attributes" section below). For example:
     #
     #      class Users < Netzke::Grid::Base
     #        def configure(c)
     #          super
     #          c.model = User
-    #          c.columns = [
+    #          c.attributes = [
     #            :first_name,
     #            :last_name,
-    #            { name: :salary, with: 50 }
+    #            { name: :salary, read_only: true }
     #          ]
     #        end
     #      end
     #
     #   Defaults to model attribute list.
     #
+    #   Note, that you can also individually override attribute configs, see +Basepack::Attributes+.
+    #
+    # [columns]
+    #
+    #   Array of columns to be displayed in the grid. This overrides the +attributes+ config option. For example:
+    #
+    #      class Users < Netzke::Grid::Base
+    #        def configure(c)
+    #          super
+    #          c.model = User
+    #          c.attributes = [
+    #            :first_name,
+    #            :last_name,
+    #            { name: :salary, width: 50 }
+    #          ]
+    #        end
+    #      end
+    #
     #   Note, that you can also individually override column configs (e.g. setting a column's width) by using the
-    #   +column+ DSL method (see +Basepack::Columns+), and override attributes (e.g. making an attribute read-only) by
-    #   using the +attribute+ DSL method (see +Basepack::Attributes+).
+    #   +column+ DSL method (see +Basepack::Columns+).
+    #
+    #   Defaults to attribute names listed with the +attributes+ config option.
     #
     # [form_items]
     #
-    #   Array of form items. This may define arbitrary form layout. An item that represents a specific attribute, should
-    #   be specified as either a symbol (attribute name), or a hash containing the +name+ key pointing to the attribute
-    #   name, as well as additional configuration keys.
+    #   Array of items to be displayed in the grid's forms. This overrides the +attributes+ config option and may define
+    #   arbitrary form layout. An item that represents a specific attribute, should be specified as either a symbol
+    #   (attribute name), or a hash containing the +name+ key pointing to the attribute name, as well as additional
+    #   configuration keys.
     #
     #      class Users < Netzke::Grid::Base
     #        def configure(c)
@@ -67,7 +87,7 @@ module Netzke
     #        end
     #      end
     #
-    #   Defaults to model attribute list.
+    #   Defaults to attribute names listed with the +attributes+ config option.
     #
     # [attribute_overrides]
     #
@@ -104,18 +124,28 @@ module Netzke
     #
     #   A hash of attributes to be merged atop of every created/updated record, e.g. +role_id: 1+
     #
-    # [edit_inline]
-    #   Whether record editing should happen inline (as opposed to using a form). When set to +true+, automatically sets
-    #   +paging+ to +true+. Defaults to +false+.
-    #
     # [context_menu]
     #
     #   An array of actions (e.g. [:edit, "-", :delete] - see the Actions section) or +false+ to disable the context menu.
     #
     # [paging]
     #
-    #   Set to +true+ to use pagination instead of infinite scrolling. Is automatically set to
-    #   +true+ if +edit_inline+ is +true+. Defaults to +false+.
+    #   Type of pagination to use:
+    #
+    #   * :buffered (default) - implements "infinite scrolling" with help of the Ext's buffered store
+    #   * :pagination - uses the paging toolbar
+    #   * :none - loads all data at once
+    #
+    # [editing]
+    #
+    #   Grid editing mode:
+    #
+    #   * :in_form (default) - all add/edit operations are performed via a form
+    #   * :inline - all add/edit operations are performed inline, with exception of multi-line editing, which is done
+    #   via a form. Note: 1) this option is not compatible with `paging` set to :buffered, 2) if no `paging` option is
+    #   set, setting this option will automatically set that to :pagination.
+    #   * :both - same as :inline, but there are 2 more actions added to the toolbar: "Add in form" and "Edit in form",
+    #   which will use a form.
     #
     # [store_config]
     #

data/lib/netzke/grid/base/client/base.js

@@ -38,13 +38,13 @@
     this.store = this.netzkeBuildStore();
 
     // Cell editing
-    if (!this.prohibitUpdate && this.editInline) {
+    if (this.netzkePermits('update') || this.netzkePermits('create') && this.editsInline) {
       this.plugins.push(Ext.create('Ext.grid.plugin.CellEditing', {pluginId: 'celleditor'}));
     }
 
     // Toolbar
     this.dockedItems = this.dockedItems || [];
-    if (this.paging) {
+    if (this.paging == 'pagination') {
       this.dockedItems.push({
         xtype: 'pagingtoolbar',
         dock: 'bottom',
@@ -75,7 +75,7 @@
 
     // When starting editing as assocition column, pre-load the combobox store from the meta column, so that we don't see the real value of this cell (the id of the associated record), but rather the associated record by the configured method.
     this.on('beforeedit', function(editor, e){
-      if (e.column.assoc && e.record.get('meta') && e.column.getEditor()) {
+      if (e.column.assoc && e.column.getEditor()) {
         var c = e.column,
         combo = c.getEditor(),
         store = combo.store,
@@ -83,7 +83,7 @@
 
         // initial load of 1 single record for the combobox store, which contains the display text (stored in the meta field) for the current value
         if (id && -1 == store.find('value', id)) {
-          store.loadData([[e.record.get(e.field), e.record.get('meta').associationValues[e.field]]], true);
+          store.loadData([[e.record.get(e.field), e.record.get('association_values')[e.field]]], true);
         }
 
       }
@@ -109,6 +109,7 @@
     }
 
     this.on('itemdblclick', this.netzkeHandleItemdblclick, this);
+    this.on('beforeedit', this.netzkeHandleBeforeEdit, this);
 
     // Remember grid selection on reloads
     if(this.netzkeRememberSelection && this.netzkeRestoreSelection){
@@ -144,10 +145,12 @@
       pruneModifiedRecords: true,
       remoteSort: true,
       remoteFilter: true,
-      buffered: !this.paging
+      buffered: this.paging == 'buffered'
     };
 
-    if (!this.paging) defaults.pageSize = 300;
+    if (this.paging == 'buffered') defaults.pageSize = 300;
+
+    if (this.paging == 'none') defaults.pageSize = 0;
 
     return Ext.apply({}, this.storeConfig, defaults);
   },

data/lib/netzke/grid/base/client/extensions.js

@@ -149,9 +149,12 @@ Ext.define('Netzke.Grid.Proxy', {
 
 // Fix for CheckColumn
 Ext.override(Ext.ux.CheckColumn, {
-  processEvent: function(type) {
-    // by returning true, we'll allow event propagation, so it reacts similarly to other columns
-    if (this.readOnly && type == 'mousedown') return true;
-    else return this.callOverridden(arguments);
+  processEvent: function(type, view, _, _, _, _, record) {
+    if (type == 'mousedown' && this.readOnly || !view.grid.netzkePermitInlineEdit(record)) {
+      // by returning true, we'll allow event propagation, so it reacts similarly to other columns
+      return true;
+    } else {
+      return this.callOverridden(arguments);
+    }
   }
 });

data/lib/netzke/grid/configuration.rb

@@ -20,13 +20,7 @@ module Netzke
       end
 
       def default_bbar
-        [].tap do |bbar|
-          bbar << :add if has_add_action?
-          bbar << :edit if has_edit_action?
-          bbar << :apply if has_apply_action?
-          bbar << :delete if has_delete_action?
-          bbar << :search if has_search_action?
-        end
+        [:add, :add_in_form, :edit, :edit_in_form, :apply, :delete, :search]
       end
 
       def context_menu
@@ -61,10 +55,24 @@ module Netzke
 
       def validate_config(c)
         raise ArgumentError, "Grid requires a model" if model.nil?
-        c.paging = true if c.edit_inline
+
+        c.editing = :in_form if c.editing.nil?
+
+        c.edits_in_form = [:both, :in_form].include?(c.editing)
+        c.edits_inline = [:both, :inline].include?(c.editing)
+
+        if c.paging.nil?
+          c.paging = c.edits_inline ? :pagination : :buffered
+        end
+
+        if c.paging == :buffered && c.edits_inline
+          raise ArgumentError, "Buffered grid cannot have inline editing"
+        end
+
         c.tools = tools
         c.bbar = bbar
         c.context_menu = context_menu
+
         super
       end
     end

data/lib/netzke/tree/base.rb

@@ -54,6 +54,29 @@ module Netzke
     #   Note, that the root record can be hidden from the tree by specifying the `Ext.tree.Panel`'s `root_visible`
     #   config option set to `false`, which is probably what you want when you have multiple root records.
     #
+    # [scope]
+    #
+    #   A Proc or a Hash used to scope out grid data. The Proc will receive the current relation as a parameter and must
+    #   return the modified relation. For example:
+    #
+    #      class Books < Netzke::Grid::Base
+    #        def configure(c)
+    #          super
+    #          c.model = Book
+    #          c.scope = lambda {|r| r.where(author_id: 1) }
+    #        end
+    #      end
+    #
+    #   Hash is being accepted for conivience, it will be directly passed to `where`. So the above can be rewritten as:
+    #
+    #      class Books < Netzke::Grid::Base
+    #        def configure(c)
+    #          super
+    #          c.model = Book
+    #          c.scope = {author_id: 1}
+    #        end
+    #      end
+    #
     # [drag_drop]
     #
     #   Enables drag and drop in the tree.
@@ -108,9 +131,9 @@ module Netzke
       # Overrides Grid::Services#get_records
       def get_records(params)
         if params[:id] == 'root'
-          model_adapter.find_root_records
+          model_adapter.find_root_records(config[:scope])
         else
-          model_adapter.find_record_children(model_adapter.find_record(params[:id]))
+          model_adapter.find_record_children(model_adapter.find_record(params[:id]), config[:scope])
         end
       end
 
@@ -126,7 +149,7 @@ module Netzke
       def node_to_hash(record, columns)
         model_adapter.record_to_hash(record, columns).tap do |hash|
           if is_node_expanded?(record)
-            hash["children"] = record.children.map {|child| node_to_hash(child, columns).netzke_literalize_keys}
+            hash["children"] = model_adapter.find_record_children(record, config[:scope]).map {|child| node_to_hash(child, columns).netzke_literalize_keys}
           end
         end
       end

data/lib/netzke/tree/base/client/base.js

@@ -32,6 +32,7 @@
     }, this);
 
     this.on('itemdblclick', this.netzkeHandleItemdblclick, this);
+    this.on('beforeedit', this.netzkeHandleBeforeEdit, this);
   },
 
   /**
@@ -45,6 +46,7 @@
   netzkeBuildStore: function() {
     var store = Ext.create('Ext.data.TreeStore', Ext.apply({
       proxy: this.netzkeBuildProxy(),
+      fields: this.fields,
       pruneModifiedRecords: true,
       remoteSort: true,
       remoteFilter: true,
@@ -148,5 +150,11 @@
         store.sync();
       }
     }, this);
+  },
+
+  netzkeExtractFieldConfig: function(c){
+    var res = this.callParent([c]);
+    if (res.name == 'id') res.type = 'auto';
+    return res;
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 1.0.0.1
+  version: 1.0.1.0
 platform: ruby
 authors:
 - Max Gorin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-05-01 00:00:00.000000000 Z
 dependencies: []
 description: A set of feature-rich extendible Netzke components (such as Grid, Tree,
   Form, Window) and component extensions which can be used as building blocks for
@@ -35,7 +35,6 @@ files:
 - lib/netzke/basepack/action_column.rb
 - lib/netzke/basepack/active_record.rb
 - lib/netzke/basepack/attr_config.rb
-- lib/netzke/basepack/attribute_config.rb
 - lib/netzke/basepack/attributes.rb
 - lib/netzke/basepack/column_config.rb
 - lib/netzke/basepack/columns.rb

data/lib/netzke/basepack/attribute_config.rb

@@ -1,10 +0,0 @@
-module Netzke
-  module Basepack
-    # TODO get rid
-    class AttributeConfig < ActiveSupport::OrderedOptions
-      def initialize(name)
-        self.name = name.to_s
-      end
-    end
-  end
-end