redde 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b20e80d5aa589293434167198fb19cf11781a9a
-  data.tar.gz: 0fbd0777cb468990d48ac661129f17bf911c2a4a
+  metadata.gz: 9ee9c12645cc53a3675c450f41c7c03b4a7996fb
+  data.tar.gz: 9075982586a39f0613bfd16104ce28bf6a0976ff
 SHA512:
-  metadata.gz: 6d69ff6e8d66f00fe97b06eb5382ec7f3266d290c79a379f011f146e25bc90a689bf0d80df8e6c41b27a74e5bd6af9a409c88ea63882d5cd087e75f25954e8c0
-  data.tar.gz: 4a3d13d84b614a5bec5a45f73b9383246bb79eaef4106cd328c394f633ceceb20e7715cfe65c5a28fa42e61ce0de1e1a50fd163d47ec520dedc57669199ef0f1
+  metadata.gz: 6ae3d469cdcb9281fd6c3ee760b327fbea46a451ba7e6b3da28659d51df737b6facf306ad51a4e2dccfa8660e062916e0b83433312bb80b4887833e5a6c353f5
+  data.tar.gz: bdc2fde36b52b309343cb21fae9bf3fc13a9b325f695aadf947f995068450bf329fd1014d6db15909e7829d58df514d1a410c3d371bd5a4d2b86e378ad5daa2b

data/app/helpers/redde/index_helper.rb

@@ -1,9 +1,13 @@
 # coding: utf-8
 module Redde::IndexHelper
-  IGNORED_COLUMNS = %w(ancestry position created_at updated_at id)
+  IGNORED_COLUMNS = %w(position created_at updated_at id)
   def title_for(item)
-    return item.title if column_names.include?('title')
-    return item.name if column_names.include?('name')
+    item.send(title_symbol_for(item))
+  end
+
+  def title_symbol_for(item)
+    return 'title' if column_names.include?('title')
+    return 'name' if column_names.include?('name')
     model_name.columns.select { |i| i.type == :string }.first
   end
 
@@ -17,7 +21,7 @@ module Redde::IndexHelper
 
   def list_table_row item, &block
     render layout: 'admin/redde/row', locals: { item: item } do
-      column_names.each do |column|
+      index_columns.each do |column|
         concat list_table_cell(item, column, &block)
       end
     end
@@ -59,7 +63,14 @@ module Redde::IndexHelper
       .sort { |a, b| sort_priority(a) <=> sort_priority(b) }
   end
 
+  def index_columns
+    return model_name.INDEX_COLUMNS if defined?(model_name.INDEX_COLUMNS)
+    column_names
+  end
+
   def form_column_names
+    return model_name.FORM_COLUMNS if defined?(model_name.FORM_COLUMNS)
+    return model_name.INDEX_COLUMNS if defined?(model_name.INDEX_COLUMNS)
     column_names.select { |i| !IGNORED_COLUMNS.include?(i) }
   end
 
@@ -108,11 +119,17 @@ module Redde::IndexHelper
     content_tag :li, raw(html), id: "list_#{c.id}"
   end
 
-  def ancestry_options(items, symbol = :name)
+  def ancestry_tree(obj_class, symbol)
+    ancestry_options(obj_class.unscoped.arrange(order: :position), symbol) { |i| "#{'--' * i.depth} #{i.send(symbol)}" }
+  end
+
+  def ancestry_options(items, symbol = :name, &block)
+    return ancestry_options(items, symbol) { |i| "#{'-' * i.depth} #{i.send(symbol)}" } unless block_given?
+
     result = []
     items.map do |item, sub_items|
       result << [yield(item), item.id]
-      result += ancestry_options(sub_items) { |i| "#{'---' * i.depth} #{i.send(symbol)}" }
+      result += ancestry_options(sub_items, symbol) { |i| "#{'---' * i.depth} #{i.send(symbol)}" }
     end
     result
   end

data/app/views/admin/base/edit.html.haml

@@ -2,7 +2,7 @@
   - form_column_names.each do |column|
     = f.redde_field column.to_sym
   - if column_names.include?('ancestry')
-    = f.redde_select :parent_id, options_from_collection_for_select(f.object.class.all, :id, :title, f.object.parent_id), { include_blank: '- Выбрать -' }
+    = f.redde_select :parent_id, ancestry_tree(model_name.roots.order(:position), title_symbol_for(instance_variable_get("@#{record}"))), include_blank: 'Корневая'
 
   -# %div= render 'redditor/admin/page', { f: f } if @article.methods.include?(:page)
 

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = '0.3.10'.freeze
+  VERSION = '0.3.11'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -583,7 +583,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Admin scaffold generator for redde projects