rails_admin_sort_embedded 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a53883033a432138b65e96da0cf4b0ba650d6540
-  data.tar.gz: 02b2517b55b56dd81c5b0c635777b5da7cda8c3b
+  metadata.gz: dcf6ebd2958b3b0144c17cc6c39fc5575dce5205
+  data.tar.gz: 3af26e237488484cf6859cde6c7a738b0f0e4cdf
 SHA512:
-  metadata.gz: f8bc21dd4ebac547f8b9190522efe86118437564acd24c854a045bb688759e4edc837e6e72d5beaa87636673b8deae7a118c7aa2f50b870197603a047a63520c
-  data.tar.gz: 7b7abaa9240591ab081f6a265cf3943e840c8977640799cbe497853061b0cbd76be5a2cf51e50fe4ca7e9524f038b766744e48e1c184cb3a212d7946c6d6d5ce
+  metadata.gz: 847b12f747a99dd133a09f7401fa9f7a071daea20ee94ff936c1e33f574f15bb4fce12f6be744f8fc39890889ff6f6079b1d88b09431779d0b76649b9d8e3b5f
+  data.tar.gz: 087e44e696dd10a6c7292b69ea8b6f6f63faf6a7afcf7130c093ecaa95b23473dc09c108c5a62f1282c513d4ec89a49208dc261b949a04961113789f73a1a26b

data/README.md

@@ -37,12 +37,24 @@ In embedded model:
     field :order, type: Integer, default: 0
     scope :sorted, -> { order_by([:order, :asc]) } #optional
 
+or use https://github.com/ack43/rocket_cms and:
+
+    # generate 'order' field, 'sort' as alias and scopes 'ordered' and 'sorted'
+    include SortField
+    sort_field
+
+    or
+
+    # generate fields and scopes with prefix 'another_': 'another_order' field, 'another_sort' as alias and scopes 'another_ordered' and 'another_sorted'
+    include SortField
+    sort_field :another
+
 In parent model:
 
     embeds_many :method_name
     rails_admin do        ...
         sort_embedded({
-            fields: [:method_name],
+            fields: [{model: [:order_field_1, :order_scope_1]}, {model: [:order_field_2, :order_scope_2]}...],
             toggle_fields: [:enabled],
             thumbnail_fields: [:image, :cover],
             thumbnail_size: :thumb,
@@ -50,6 +62,27 @@ In parent model:
         })
     end
 
+
+You can not use '[:order_field_1, :order_scope_1]' and just use [:order_field_1]. Scope_name will be :order_field_1 as string + "ed"
+Default field is 'order', default scope is 'ordered';
+
+I18n:
+
+    ru:
+      rails_admin:
+        sort_embedded:
+          my_news:
+            my_news_images: Фотогалерея
+
+    # or with specified fields
+    ru:
+      rails_admin:
+        sort_embedded:
+          my_news:
+            my_news_images:
+              order: Фотогалерея
+              another_order: Фотогалерея(alt)
+
 ## Contributing
 
 1. Fork it

data/app/assets/javascripts/rails_admin/rails_admin_sort_embedded.js.coffee

@@ -1,11 +1,11 @@
 #= require rails_admin/jquery.mjs.nestedSortable
 
-show_flash = (data)->
+show_flash = (selector, data)->
   $flash = $('<div>')
     .addClass('nestable-flash alert')
     .append($('<button>').addClass('close').data('dismiss', 'alert').html('&times;'))
     .append($('<span>').addClass('body').html(data))
-  $('#rails_admin_nestable').append($flash)
+  $(selector).append($flash)
   $flash.fadeIn(200).delay(2000).fadeOut 200, -> $(this).remove()
 
 js_tree_toggle = (e)->
@@ -46,6 +46,8 @@ init = ->
         ui.item.closest("ol").find("li").each ->
           ids_array.push $(this).data("id")
 
+        selector = "#rails_admin_nestable_" + tree_config["embedded_field"] + "_" + (tree_config["embedded_model_order_field"] || "order")
+
         $.ajax
           type: "POST"
           dataType: "html"
@@ -54,16 +56,17 @@ init = ->
             #item_id: ui.item.data("id")
             embedded_model: tree_config["embedded_model"]
             embedded_field: tree_config["embedded_field"]
+            embedded_model_order_field: tree_config["embedded_model_order_field"]
             #parent_id: ui.item.parent().parent().data("id")
             #prev_id: ui.item.prev().data("id")
             #next_id: ui.item.next().data("id")
             ids_array: ids_array.join(" ")
 
           error: (xhr, status, error) ->
-            show_flash('Nested Set: fatal error')
+            show_flash(selector, 'Nested Set: fatal error')
 
           success: (data) ->
-            show_flash(data)
+            show_flash(selector, data)
 
 $(document).off('pjax:end.rails_admin_sort_embedded').on('pjax:end.rails_admin_sort_embedded', init)
 $(document).off('ready.rails_admin_sort_embedded').on('ready.rails_admin_sort_embedded', init)

data/app/assets/stylesheets/rails_admin/rails_admin_sort_embedded.css.scss

@@ -184,7 +184,7 @@
   text-decoration: none;
 }
 
-#rails_admin_nestable {
+.rails_admin_nestable {
   position: relative;
   margin-bottom: 100px;
 }

data/app/views/rails_admin/main/sort_embedded.html.haml

@@ -5,11 +5,48 @@
   %ul.nav.nav-tabs
     - sort_embedded_fields.each do |f|
       %li
-        = link_to I18n.t("rails_admin.sort_embedded.#{@object.class.name.tableize}.#{f}"), "#sort_embedded_#{f}", title: f, "data-toggle" => "tab"
+        :ruby
+          if f.is_a?(Hash)
+            embedded_field              = f.keys.first
+            embedded_model_order_field  = f.values.first
+            embedded_model_order_field  = embedded_model_order_field.last if embedded_model_order_field.is_a?(Array)
+
+            i18n_path         = "rails_admin.sort_embedded.#{@object.class.name.tableize}.#{embedded_field}.#{embedded_model_order_field}"
+            i18n_path_default = "rails_admin.sort_embedded.#{@object.class.name.tableize}.#{embedded_field}"
+
+            link = "#sort_embedded_#{embedded_field}_#{embedded_model_order_field}"
+            title = I18n.t(i18n_path, default: I18n.t(i18n_path_default))
+
+          else
+            i18n_path         = "rails_admin.sort_embedded.#{@object.class.name.tableize}.#{f}.order"
+            i18n_path_default = "rails_admin.sort_embedded.#{@object.class.name.tableize}.#{f}"
+            link = "#sort_embedded_#{f}"
+            title = I18n.t(i18n_path, default: I18n.t(i18n_path_default))
+          end
+
+        = link_to I18n.t(i18n_path, default: I18n.t(i18n_path_default)), link, title: title, "data-toggle" => "tab"
 
 .tab-content
   - sort_embedded_fields.each do |f|
-    .tab-pane{id: "sort_embedded_#{f}"}
-      .row-fluid
-        .span12#rails_admin_nestable
-          = rails_admin_sort_embedded @object.send(f).to_a, {embedded_field: f}
+    - if f.is_a?(Hash)
+      - embedded_field              = f.keys.first
+      - embedded_model_order_field  = f.values.first
+      - if embedded_model_order_field.is_a?(Array)
+        - if embedded_model_order_field.size > 1
+          - embedded_model_ordered_scope  = embedded_model_order_field[1]
+        - else
+          - embedded_model_ordered_scope  = "#{embedded_model_order_field[0]}ed"
+        - embedded_model_order_field    = embedded_model_order_field[0]
+      - else
+        - embedded_model_ordered_scope  = "#{embedded_model_order_field}ed"
+
+      .tab-pane{id: "sort_embedded_#{embedded_field}_#{embedded_model_order_field}"}
+        .row-fluid
+          .span12.rails_admin_nestable{id: "rails_admin_nestable_#{embedded_field}_#{embedded_model_order_field}"}
+            = rails_admin_sort_embedded @object.send(embedded_field).send(embedded_model_ordered_scope).to_a, {embedded_field: embedded_field, embedded_model_order_field: embedded_model_order_field}
+
+    - else
+      .tab-pane{id: "sort_embedded_#{f}"}
+        .row-fluid
+          .span12.rails_admin_nestable{id: "rails_admin_nestable_#{f}_order"}
+            = rails_admin_sort_embedded @object.send(f).ordered.to_a, {embedded_field: f}

data/lib/rails_admin_sort_embedded/action.rb

@@ -36,6 +36,10 @@ module RailsAdmin
                   ids             = params[:ids_array].to_s.split(" ")
                   embedded_model  = params[:embedded_model].to_s
                   embedded_field  = params[:embedded_field].to_s
+
+                  embedded_model_order_field  = params[:embedded_model_order_field].to_s
+                  embedded_model_order_field  = "order" if embedded_model_order_field.blank?
+
                   # item_id         = params[:item_id].to_s
                   # parent_id       = params[:parent_id].to_s
                   # prev_id         = params[:prev_id].to_s
@@ -48,7 +52,7 @@ module RailsAdmin
                   main_obj = @object
                   embedded = main_obj.send(embedded_field)
                   ids.each_with_index do |id, i|
-                    embedded.find(id).update(order: i)
+                    embedded.find(id).update(embedded_model_order_field.to_sym => i)
                   end
 
                   message = "<strong>#{I18n.t('admin.actions.sort_embedded.success')}!</strong>"
@@ -58,7 +62,7 @@ module RailsAdmin
                   main_obj = @object
                   embedded = main_obj.send(embedded_field).sorted
                   ids.each_with_index do |id, i|
-                    embedded.find(id).update(order: i)
+                    embedded.find(id).update(embedded_model_order_field.to_sym => i)
                   end
 
                   message = "<strong>#{I18n.t('admin.actions.sort_embedded.error')}</strong>: #{e}"

data/lib/rails_admin_sort_embedded/configuration.rb

@@ -6,7 +6,7 @@ module RailsAdminSortEmbedded
 
     def options
       @options ||= {
-          fields: [],
+          fields: [{}],
           thumbnail_fields: [:image, :cover],
           thumbnail_size: :thumb,
           thumbnail_gem: :paperclip,

data/lib/rails_admin_sort_embedded/helper.rb

@@ -1,11 +1,12 @@
 module RailsAdminSortEmbedded
   module Helper
     def rails_admin_sort_embedded(tree, opts= {})
-      tree = tree.to_a.sort_by { |m| m.order }
+      tree = tree.to_a.sort_by { |m| m.send(opts[:embedded_model_order_field] || "order") }
       roots = tree#.select{|elem| elem.parent_id.nil?}
       id = "ns_#{rand(100_000_000..999_999_999)}"
       tree_config = {update_url: sort_embedded_path(model_name: @abstract_model),
                      embedded_field: opts[:embedded_field],
+                     embedded_model_order_field: opts[:embedded_model_order_field],
                      embedded_model: @abstract_model.model.new.send(opts[:embedded_field]).new.class.to_s}.to_json
       content_tag(:ol, rails_admin_sort_embedded_builder(roots, tree), id: id, class: 'dd-list rails_admin_sort_embedded', 'data-config' => tree_config)
     end

data/lib/rails_admin_sort_embedded/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminSortEmbedded
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_sort_embedded
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails_admin