redde 0.3.22 → 0.3.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 154c245f54bb6a65a6be504bd7426c1c0ccab5f9
-  data.tar.gz: 5ed9a3bda4d25539d23eceece3113a309787f2f4
+  metadata.gz: d0efa702172d1b777179f2041fdab06a083f4f01
+  data.tar.gz: eb958f7bc8cc84e9524ea3f586bfa05d8d58480c
 SHA512:
-  metadata.gz: f179259536bd2ea94f6576095d5a267fb48a50dbbc6998085b2e10fbcb1b379ecc1de07cea81f1d77852770ba6228a56e7c9705a23b27d63d8688ef8e78924cf
-  data.tar.gz: 774f205d1f7882f94a14e8a23cb8cf3a50e5c0e5a9264503a4e9e4a67ab5c49564349aa5ffad32b36b09315908457c7196769feda96ca9ae76627ae84ef90931
+  metadata.gz: 458cdf655e6ee8990d5aafe0e48bc231112cce07c35dff89d13a01bf894182fca5842aef1c8bc9a67aeada5091537b076845c097b5c5b81d2de602ff27cd2c8c
+  data.tar.gz: cede951278c32817510c45fe5e2d73c72cfb875a05c2876f43f9a2ea0e188eaf302fdb21a0a74d81d37a68e1c13307ab5fec8aad31b777df0b91bbee9879b83c

data/app/assets/stylesheets/redde/blocks/list.sass

@@ -31,6 +31,7 @@
     background: #d7e4ef
     padding-right: 0
     min-width: 10px
+    width: 0.01%
 
   &._img
     padding-left: 20px
@@ -62,7 +63,8 @@
   &:first-child,
   &:last-child
     padding-right: 0
-    width: 10px
+    min-width: 10px
+    width: 0.01%
     border-bottom: 0 none
 
   &._handle

data/app/controllers/admin/base_controller.rb

@@ -4,9 +4,6 @@ class Admin::BaseController < ActionController::Base
   include Redde::AdminHelper
   include Redde::IndexHelper
 
-  def welcome
-  end
-
   def index
     instance_variable_set("@#{collection}", scope)
     return render 'tree' if column_names.include?('ancestry')

data/app/helpers/redde/index_helper.rb

@@ -11,36 +11,111 @@ module Redde::IndexHelper
     model_name.columns.select { |i| i.type == :string }.first
   end
 
-  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 )
+  class IndexBuilder
+    include ActionView::Helpers::TagHelper
+    include ActionView::Context
+
+    attr_accessor :list, :params
+
+    def initialize(list, params)
+      @list = list
+      @params = params
+    end
+
+    def empty( options = {} )
+      content_tag(:th, "", class: ['list__head', options[:class]])
+    end
+
+    def thead insert
+      content_tag :thead do
+        content_tag(:tr, empty + visible + insert + empty(class: 'list__head_del') + empty)
       end
     end
-  end
 
-  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)
+    def visible
+      empty(class: '_eye') if list.column_names.include?('visible')
+    end
+
+    class IndexHeadCellBuilder
+      include ActionView::Helpers::TagHelper
+      include ActionView::Context
+
+      attr_accessor :list
+
+      def initialize(list)
+        @list = list
+      end
+
+      def cell field = nil, options = {}, &block
+        content_tag :th, list.human_attribute_name(field), class: ['list__head', options[:class]]
       end
     end
-  end
 
-  def list_table_cell(item, column, &block)
-    case column
-    when 'position'
-      content_tag(:td, "", class: 'list__cell _handle', 'data-sortable-handle' => "")
-    when 'visible'
-      content_tag(:td, link_to('', url_for(id: item, action: :update, record => { visible: !item.visible} ), class: ['list__eye', ('_disactive' if !item.visible)], data: { method: 'put' }), class: 'list__cell _eye')
-    when 'title', 'name'
-      content_tag(:td, link_to(item.send(column), url_for(id: item, action: :edit)), class: 'list__cell')
-    else
-      if block_given?
-        capture(item, column, &block)
-      else
-        content_tag :td, item.send(column), class: 'list__cell'
+    class IndexCellBuilder
+      include ActionView::Helpers
+      include ActionView::Context
+      include ActionView::Helpers::UrlHelper
+      include Rails.application.routes.url_helpers
+      include Haml::Helpers
+
+      attr_accessor :item, :builder
+
+      def initialize(item, builder)
+        @item = item
+        @builder = builder
+        init_haml_helpers
       end
+
+      def self.content value
+        case value.class.name
+        when 'Time' then I18n.l(value, format: '%d %b %Y, %H:%M')
+        when 'Date' then I18n.l(value, format: '%d %b %Y')
+        else
+          value
+        end
+      end
+
+      def cell(field, options = {}, &block)
+        # через content_tag ... do не работает
+        content_tag :td, if block_given? then capture(&block) else IndexCellBuilder.content(item.send(field)) end, class: ['list__cell', options[:class]]
+      end
+
+      def empty(options = {})
+        content_tag(:td, "", class: ['list__cell', options[:class]])
+      end
+
+      def handle
+        return content_tag(:td, "", class: ['list__cell', '_handle'], 'data-sortable-handle' => "") if item.class.column_names.include?('position')
+        empty
+      end
+
+      def visible
+        content_tag :td, class: 'list__cell _eye' do
+          link_to('', url_for(id: item, controller: builder.params[:controller], action: :update, item.class.model_name.param_key => { visible: !item.visible} ), class: ['list__eye', ('_disactive' if !item.visible)], data: { method: 'put' })
+        end if item.class.column_names.include?('visible')
+      end
+
+      def del
+        content_tag :td, class: 'list__cell list__cell_del' do
+          link_to('', url_for(id: item, action: :destroy, controller: builder.params[:controller]), method: :delete, data: { confirm: 'Точно удалить?' }, class: 'list__del')
+        end
+      end
+    end
+  end
+
+  def list_table(list, options = {}, &block)
+    raise ArgumentError, "Missing block" unless block_given?
+    builder = IndexBuilder.new(list, params)
+
+    html = list.map do |item|
+      cb = IndexBuilder::IndexCellBuilder.new(item, builder)
+      content_tag(:tr, cb.handle + cb.visible + capture(cb, &block) + cb.del + cb.empty, 'data-href' => url_for(id: item, action: :edit), 'data-sortable-item' => "", id: "pos_#{item.id}")
+    end.join.html_safe
+
+    hb = IndexBuilder::IndexHeadCellBuilder.new(list)
+    content_tag :table, class: ['list', options[:class]], style: options[:style], "data-sortable" => { handle: "[data-sortable-handle]" }.to_json do
+      concat builder.thead( capture(hb, &block) )
+      concat html
     end
   end
 

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

@@ -1,8 +1,9 @@
 = redde_page do |f|
   - form_column_names.each do |column|
-    = f.redde_field column.to_sym
-  - if column_names.include?('ancestry')
-    = f.redde_select :parent_id, ancestry_tree(model_name.roots.order(:position), title_symbol_for(instance_variable_get("@#{record}"))), include_blank: 'Корневая'
+    - if column == 'ancestry'
+      = f.redde_select :parent_id, ancestry_tree(model_name.roots.order(:position), title_symbol_for(instance_variable_get("@#{record}"))), include_blank: 'Корневая'
+    - else
+      = f.redde_field column.to_sym
 
   -# %div= render 'redditor/admin/page', { f: f } if @article.methods.include?(:page)
 

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

@@ -1,6 +1,5 @@
 = page_header
 
-- res_collection = instance_variable_get("@#{collection}")
-
-= list_table res_collection do |item, column|
-  %td.list__cell= render_item_column(item, column)
+= list_table instance_variable_get("@#{collection}") do |t|
+  - (index_columns - ['position', 'visible']).each do |column|
+    = t.cell column

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = '0.3.22'.freeze
+  VERSION = '0.3.23'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -522,7 +522,6 @@ files:
 - app/views/admin/base/edit.html.haml
 - app/views/admin/base/index.html.haml
 - app/views/admin/base/tree.html.haml
-- app/views/admin/base/welcome.haml
 - app/views/admin/managers/edit.html.haml
 - app/views/admin/redde/_header.html.haml
 - app/views/admin/redde/_list.html.haml

data/app/views/admin/base/welcome.haml

@@ -1,2 +0,0 @@
-= content_for :page_header do
-  %h1 Welcome