redde 0.3.11 → 0.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ee9c12645cc53a3675c450f41c7c03b4a7996fb
-  data.tar.gz: 9075982586a39f0613bfd16104ce28bf6a0976ff
+  metadata.gz: 6223aa27718ba7b312a123c5857c21aa37230ce0
+  data.tar.gz: a3654c84d19fef5d7ba239d8641cc090726a7e79
 SHA512:
-  metadata.gz: 6ae3d469cdcb9281fd6c3ee760b327fbea46a451ba7e6b3da28659d51df737b6facf306ad51a4e2dccfa8660e062916e0b83433312bb80b4887833e5a6c353f5
-  data.tar.gz: bdc2fde36b52b309343cb21fae9bf3fc13a9b325f695aadf947f995068450bf329fd1014d6db15909e7829d58df514d1a410c3d371bd5a4d2b86e378ad5daa2b
+  metadata.gz: 5efd5966f8872605b7b316a244a737852c4538dbe4b731066dbf3143db711944e18a4b736982b6164f3864b462db1d5dbe6d8acf6d0c15e1d9e5ff43e0918389
+  data.tar.gz: bfd75da454ecdb75a8a1827e8cb337c994cafed91b33cd17b7225877960dbea0ee9cb10c8a5eed00bbf55314c7827d9a1dcb25af1d4bcdc0ce690ab4a250cec4

data/app/helpers/redde/index_helper.rb

@@ -11,7 +11,7 @@ module Redde::IndexHelper
     model_name.columns.select { |i| i.type == :string }.first
   end
 
-  def list_table res_collection, &block
+  def list_table(res_collection, &block)
     render layout: 'admin/redde/list', locals: { res_collection: res_collection } do
       res_collection.each do |item|
         concat list_table_row( item, &block )
@@ -19,7 +19,7 @@ module Redde::IndexHelper
     end
   end
 
-  def list_table_row item, &block
+  def list_table_row(item, &block)
     render layout: 'admin/redde/row', locals: { item: item } do
       index_columns.each do |column|
         concat list_table_cell(item, column, &block)
@@ -27,7 +27,7 @@ module Redde::IndexHelper
     end
   end
 
-  def list_table_cell item, column, &block
+  def list_table_cell(item, column, &block)
     case column
     when 'position'
       content_tag(:td, "", class: 'list__cell _handle', 'data-sortable-handle' => "")
@@ -64,13 +64,13 @@ module Redde::IndexHelper
   end
 
   def index_columns
-    return model_name.INDEX_COLUMNS if defined?(model_name.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)
+    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
 
@@ -133,4 +133,12 @@ module Redde::IndexHelper
     end
     result
   end
+
+  def render_item_column(item, column)
+    case item.send(column).class
+    when Time then l(item.send(column), format: '%d %b %Y, %H:%M')
+    else
+      item.send(column)
+    end
+  end
 end

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

@@ -3,8 +3,4 @@
 - res_collection = instance_variable_get("@#{collection}")
 
 = list_table res_collection do |item, column|
-  %td.list__cell
-    - if item.send(column).is_a?(Time)
-      = l item.send(column), format: '%d %b %Y, %H:%M'
-    - else
-      = item.send(column)
+  %td.list__cell= render_item_column(item, column)

data/app/views/admin/redde/_list.html.haml

@@ -2,14 +2,14 @@
   %table.list{list_table_options}
     %colgroup
       %col.list__col
-      - column_names.each do |column|
+      - index_columns.each do |column|
         %col.list__col
       %col.list__col._del
       %col.list__col
     %thead
       %tr
         %th.list__head
-        - column_names.each_with_index do |column, index|
+        - index_columns.each_with_index do |column, index|
           - if ['position', 'visible'].include? column
             %th.list__head.list__head_empty
           - else

data/lib/redde/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.3.12
 platform: ruby
 authors:
 - Oleg Bovykin