admin_it 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e96e6d9fe0799703b334eb063cf44a1ee7498ae0
-  data.tar.gz: 2d67207520e2cf2cdad5409a96711587b63abdb6
+  metadata.gz: 6ec3eb78a87d91d7b2dba8f2c4113960ae39b73e
+  data.tar.gz: f4f6e92081571574f4b8a919747a7fe98369a603
 SHA512:
-  metadata.gz: ef9256ae9ff7ac5710c74fdbad74a401c72d1fa0c6b45942869cef6bf1e4fce353ca393ebe574d71cda077fa1525b75162869b57af8d5b8a37effb104aefa66b
-  data.tar.gz: 9638a3aef76d5b3f5a24d1463c08f60049dfc2e17b5a3402c37d4d531073e82cc893badb83a1ca1cf168bc11a30bc9760a0e115ec658f570373460d965b9571f
+  metadata.gz: 19616ee61e99a9291bd57b5f581687eefc43b8ff560614c3b9a3de1d013ba1fc1891f3d5d89655d60ede36e14df612b752aba6574703c3282dc1e8a130c7cbf8
+  data.tar.gz: 3238518aff17e67ddc0d1c65220ec89d23ce943149428680c1a10e5ce5c7851d6c5a107167fa638d6d27b5bfb9086f7a0ed413a0654e453767eebadc321a383b

data/lib/admin_it/context/context.rb

@@ -159,7 +159,7 @@ module AdminIt
       when :sortable then values.select { |f| f.sortable? }
       when :with_labels then values.select { |f| f.show_label? }
       when :without_labels then values.select { |f| !f.show_label? }
-      when Field::TYPES then values.select { |f| f.type == scope }
+      when *Field::TYPES then values.select { |f| f.type == scope }
       else values
       end
     end

data/lib/admin_it/field/field.rb

@@ -268,7 +268,7 @@ module AdminIt
       when :sortable then values.select { |f| f.sortable? }
       when :with_labels then values.select { |f| f.show_label? }
       when :without_labels then values.select { |f| !f.show_label? }
-      when Field::TYPES then values.select { |f| f.type == scope }
+      when *Field::TYPES then values.select { |f| f.type == scope }
       else values
       end
     end

data/lib/admin_it/helpers/table.rb

@@ -27,6 +27,15 @@ module AdminIt
         entity = context.entity
         resource = parent.parent.resource
         single = resource.singles.select { |c| !(c <= NewContext) }
+
+        p_context = context.child? ? context.parent : context
+        params = {}
+        params[:section] = p_context.section if p_context.respond_to?(:section)
+        if context.child?
+          params[:layout] = :dialog
+          params[:parent] = context.parent
+        end
+
         buttons = single.map do |_context|
           if _context <= ShowContext && context.show_in_dialog?
             '<a class="btn btn-xs btn-info" ' +
@@ -35,8 +44,9 @@ module AdminIt
             %Q(<i class="fa fa-#{_context.icon}"></i></a>)
           else
             cl = _context <= ShowContext ? 'info' : 'default'
-            href = _context.path(entity)
-            "<a class=\"btn btn-xs btn-#{cl}\" href=\"#{href}\">" \
+            href = _context.url(entity, **params)
+            data = context.child? ? %Q(data-toggle="modal" data-target="#confirm_modal") : ''
+            "<a class=\"btn btn-xs btn-#{cl}\" href=\"#{href}\"#{data}>" \
             "<i class=\"fa fa-#{_context.icon}\"></i></a>"
           end
         end

data/lib/admin_it/version.rb

@@ -1,5 +1,5 @@
 #
 module AdminIt
   # Current gem version
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: admin_it
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Alexey Ovchinnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails