netzke-basepack 0.12.6 → 0.12.7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.12.7 - 2015-08-09
+* Fix the strong_default_attrs option support
+* Support column action's isDisabled option
+* Store tree nodes expand/collapse state
+
 # 0.12.6 - 2015-07-11
 * Regression: show cell editor on adding/editing a record in grid
 * Fix occasional autoload-related problems

data/lib/netzke/basepack/action_column.rb

@@ -58,7 +58,7 @@ module Netzke
           a[:handler] = Netzke::Core::JsonLiteral.new <<-JS
           function() {
             var cmp = Ext.getCmp('#{js_id}'),
-              f = cmp.on#{a[:handler].to_s.camelize};
+                f = cmp.on#{a[:handler].to_s.camelize};
             if (Ext.isFunction(f)) {
               f.apply(cmp, arguments);
             } else {
@@ -67,6 +67,12 @@ module Netzke
           }
           JS
 
+          a[:is_disabled] &&= Netzke::Core::JsonLiteral.new <<-JS
+          function() {
+            var cmp = Ext.getCmp('#{js_id}');
+            return cmp.#{a[:is_disabled].to_s.camelize(:lower)}.apply(cmp, arguments);
+          }
+          JS
           a[:icon] = "#{Netzke::Core.icons_uri}/#{a[:icon]}.png" if a[:icon].is_a?(Symbol)
         end
       end

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

@@ -217,7 +217,7 @@ module Netzke::Basepack::DataAdapters
 
     # Assigns new value to an (association) attribute in a given record
     # +role+ - role provided for mass assignment protection
-    def set_record_value_for_attribute(record, attr, value, role = :default)
+    def set_record_value_for_attribute(record, attr, value)
     end
 
     # Returns human attribute name

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

@@ -252,21 +252,23 @@ module Netzke::Basepack::DataAdapters
       v
     end
 
-    def set_record_value_for_attribute(r, a, v, role = :default)
-      v = v.to_time_in_current_zone if v.is_a?(Date) # convert Date to Time
-      unless a[:read_only]
-        if a[:setter]
-          a[:setter].call(r, v)
-        elsif r.respond_to?("#{a[:name]}=")
-          r.send("#{a[:name]}=", v)
-        elsif association_attr?(a)
-          split = a[:name].to_s.split(/\.|__/)
-          if a[:nested_attribute]
+    def set_record_value_for_attribute(record, attr, value)
+      ::Rails.logger.debug "\n!!! attr: #{attr.inspect}\n"
+      value = value.to_time_in_current_zone if value.is_a?(Date) # convert Date to Time
+      unless attr[:read_only]
+        if attr[:setter]
+          attr[:setter].call(record, value)
+        elsif record.respond_to?("#{attr[:name]}=")
+          ::Rails.logger.debug "\n!!! value: #{value.inspect}\n"
+          record.send("#{attr[:name]}=", value)
+        elsif association_attr?(attr)
+          split = attr[:name].to_s.split(/\.|__/)
+          if attr[:nested_attribute]
             # We want:
             #     set_value_for_attribute({:name => :assoc_1__assoc_2__method, :nested_attribute => true}, 100)
             # =>
-            #     r.assoc_1.assoc_2.method = 100
-            split.inject(r) { |r,m| m == split.last ? (r && r.send("#{m}=", v) && r.save) : r.send(m) }
+            #     record.assoc_1.assoc_2.method = 100
+            split.inject(record) { |r,m| m == split.last ? (r && r.send("#{m}=", v) && r.save) : r.send(m) }
           else
             if split.size == 2
               # search for association and assign it to r
@@ -274,9 +276,9 @@ module Netzke::Basepack::DataAdapters
               assoc_method = split.last
               if assoc
                 if assoc.macro == :has_one
-                  assoc_instance = r.send(assoc.name)
+                  assoc_instance = record.send(assoc.name)
                   if assoc_instance
-                    assoc_instance.send("#{assoc_method}=", v)
+                    assoc_instance.send("#{assoc_method}=", value)
                     assoc_instance.save # what should we do when this fails?..
                   else
                     # what should we do in this case?
@@ -285,13 +287,13 @@ module Netzke::Basepack::DataAdapters
 
                   # set the foreign key to the passed value
                   # not that if a negative value is passed, we reset the association (set it to nil)
-                  r.send("#{assoc.foreign_key}=", v.to_i < 0 ? nil : v)
+                  record.send("#{assoc.foreign_key}=", value.to_i < 0 ? nil : value)
                 end
               else
                 logger.warn "Netzke: Association #{assoc} is not known for class #{@data_class}"
               end
             else
-              logger.warn "Netzke: Wrong attribute name: #{a[:name]}"
+              logger.warn "Netzke: Wrong attribute name: #{attr[:name]}"
             end
           end
         end

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

@@ -62,7 +62,7 @@ module Netzke
           @record = data_class.new if @record.nil?
 
           hsh.each_pair do |k,v|
-            data_adapter.set_record_value_for_attribute(@record, fields[k.to_sym].nil? ? {:name => k} : fields[k.to_sym], v, config.role || :default)
+            data_adapter.set_record_value_for_attribute(@record, fields[k.to_sym].nil? ? {:name => k} : fields[k.to_sym], v)
           end
 
           # did we have complete success?

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

@@ -6,7 +6,6 @@
     if (this.isLocked) return this.callParent();
 
     this.plugins = this.plugins || [];
-    this.features = this.features || [];
 
     // Enable filters feature
     if (this.enableColumnFilters) {

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

@@ -124,22 +124,24 @@ module Netzke
         end
 
         def update_record(record, attrs)
-          # merge with strong default attirbutes
-          attrs.merge!(config[:strong_default_attrs]) if config[:strong_default_attrs]
-
           attrs.each_pair do |k,v|
             attr = final_columns_hash[k.to_sym]
             next if attr.nil?
             data_adapter.set_record_value_for_attribute(record, attr, v)
           end
 
+          strong_attrs = config[:strong_default_attrs] || {}
+
+          strong_attrs.each_pair do |k,v|
+            data_adapter.set_record_value_for_attribute(record, {name: k.to_s}, v)
+          end
+
           if record.save
             {record: data_adapter.record_to_array(record, final_columns(:with_meta => true))}
           else
             {error: record.errors.to_a}
           end
         end
-
       end
     end
   end

data/lib/netzke/basepack/tree.rb

@@ -2,7 +2,9 @@ module Netzke
   module Basepack
     # Ext.tree.Panel-based component with the following features:
     #
-    # * CRUD operations (only R is implemented atm)
+    # * CRUD operations
+    # * Persistence of node expand/collapse state
+    # * (TODO) Node reordering by DnD
     #
     # == Simple example
     #
@@ -11,7 +13,7 @@ module Netzke
     #         super
     #         c.model = "FileRecord"
     #         c.columns = [
-    #           {name: :name, xtype: :treecolumn},
+    #           {name: :name, xtype: :treecolumn}, # this column will show tree nodes
     #           :size
     #         ]
     #       end
@@ -40,7 +42,7 @@ module Netzke
     # [root]
     #
     #   By default, the component will pick whatever record is returned by `TreeModel.root`, and use it as the root
-    #   record. However, sometimes the model table has multiple root records (which `parent_id` set to `nil`), and all
+    #   record. However, sometimes the model table has multiple root records (whith `parent_id` set to `nil`), and all
     #   of them should be shown in the panel. To achive this, you can define the `root` config option,
     #   which will serve as a virtual root record for those records. You may set it to `true`, or a hash of
     #   attributes, e.g.:
@@ -49,6 +51,10 @@ 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.
+    #
+    # == Persisting nodes' expand/collapse state
+    #
+    # If the model includes the `expanded` DB field, the expand/collapse state will get stored in the DB.
     class Tree < Netzke::Base
       NODE_ATTRS = {
         boolean: %w[leaf checked expanded expandable qtip qtitle],
@@ -94,11 +100,23 @@ module Netzke
       def read(params = {})
         {}.tap do |res|
           records = get_records(params)
-          res[:data] = records.map{|r| data_adapter.record_to_hash(r, final_columns(:with_meta => true)).netzke_literalize_keys}
+          res[:children] = records.map{|r| node_to_hash(r, final_columns(with_meta: true)).netzke_literalize_keys.symbolize_keys}
           res[:total] = count_records(params)  if config[:enable_pagination]
         end
       end
 
+      def node_to_hash(record, columns)
+        data_adapter.record_to_hash(record, columns).tap do |hash|
+          if is_node_expanded?(record) && record.children.count > 0
+            hash[:children] = record.children.map {|child| node_to_hash(child, columns).netzke_literalize_keys.symbolize_keys}
+          end
+        end
+      end
+
+      def is_node_expanded?(record)
+        record.respond_to?(:expanded) && record.expanded?
+      end
+
       def js_configure(c)
         super
 
@@ -166,6 +184,14 @@ module Netzke
         this.delete(:set_form_values)
       end
 
+      endpoint :server_update_node_state do |params, this|
+        node = data_adapter.find_record(params[:id])
+        if node.respond_to?(:expanded)
+          node.expanded = params[:expanded]
+          data_adapter.save_record(node)
+        end
+      end
+
       protected
 
       def bbar

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

@@ -8,12 +8,24 @@
 
     delete this.root;
 
-    this.plugins = [];
+    this.plugins = this.plugins || [];
     this.plugins.push(Ext.create('Ext.grid.plugin.CellEditing', {pluginId: 'celleditor'}));
 
     this.callParent();
 
     this.setDynamicActionProperties(); // enable/disable actions (buttons) depending on selection
+    this.getView().on('afteritemcollapse', this.handleNodeStateChange, this);
+    this.getView().on('afteritemexpand', this.handleNodeStateChange, this);
+
+    this.store.on('load', function(){
+      var root = this.getRootNode();
+      root.collapse();
+      root.expand(false);
+    }, this);
+  },
+
+  handleNodeStateChange: function(node){
+    this.serverUpdateNodeState({id: node.get('id'), expanded: node.isExpanded()});
   },
 
   // Process selectionchange event to enable/disable actions
@@ -54,8 +66,7 @@
   netzkeBuildReader: function() {
     var modelName = Netzke.modelName(this.id);
     return Ext.create('Ext.data.reader.Json', {
-      model: modelName,
-      rootProperty: 'data'
+      model: modelName
     });
   },
 
@@ -107,6 +118,6 @@
         store.sync();
       }
     }, this);
-  }
+  },
 
 }

data/lib/netzke/basepack/version.rb

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

metadata

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