admin_it 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9810f82e274be2d97cd49f86e4e5a8c2d9d01590
-  data.tar.gz: 91d20c25c96419b05397c7158a98b9a8ee60658d
+  metadata.gz: 96f14e5a3d1ac63eac7bf189a7ed9419cd9db032
+  data.tar.gz: b9d171451605007606dba4b88648e4219aa291cb
 SHA512:
-  metadata.gz: 8d7448bfe2a51c9fed2e67a0f307ec27088fdbbd348b7cf0258fe07b00804ef291bd192283352d9f05b1699a662db0d2d43c336b3180ac58f65c084edc1122d3
-  data.tar.gz: c3b4dabbd9e5142a8bc2fbe55a5af8c95c513dad71f2e888f0adf0e05f3a557d7a54dd00b17698873b4a44d2d05ffdeea5d19205ffc338e5ae8b78997bda3572
+  metadata.gz: 69ab40b4721e23068f1883708de509fef76d4485da51e9fa1bbc56bcb201ed339bb2cf9c2dcf2bcd61e44750a633eb1e9179d32707c7b7d568c32823ae998f76
+  data.tar.gz: 149226356240bfe4fe45403ba1ce0b4c612898dacc1efeddc0ae2de2910422e5e09b6f93a14bb212dcdd9afdd5f2ab45bd7570f2639b42fa0549e581a8d55268

data/README.md

@@ -12,6 +12,7 @@ Administrative backend for ruby projects.
 
 # Todo
 
+* use_fields not working in root resource context
 * Test coverage
 * Entities editing/creating
 
@@ -21,6 +22,11 @@ Administrative backend for ruby projects.
 
 # Changes
 
+## `1.0.2`
+
+* routes moved to config folder
+* fixed issues with pundit and devise
+
 ## `1.0.1`
 
 * wrap_it link in Gemfile fixed

data/README_RU.md

@@ -19,6 +19,10 @@
 
 # Изменения
 
+## `1.0.1`
+
+* исправлена ссылка на библиотеку wrap_it
+
 ## `1.0.0` - пре-релиз
 
 * поддержка active_record

data/app/views/admin_it/shared/_filters.html.slim

@@ -1,6 +1,6 @@
 - for_context ||= context
 
-- unless for_context.filters.empty?
+- unless for_context.single? || for_context.filters.empty?
   div class="row admin-it-filters"
     ul class="nav nav-pills nav-stacked col-md-2"
       - for_context.filters.each do |filter, index|

data/config/routes.rb

@@ -0,0 +1,21 @@
+AdminIt::Engine.routes.draw do
+  AdminIt.resources.each do |name, resource|
+    resources(resource.plural,
+              controller: "admin_it/#{name}",
+              except: [:index]) do
+      resource.collections.each do |context|
+        next unless context.collection?
+        get context.context_name, on: :collection
+      end
+      unless resource.collections.empty?
+        get('/', on: :collection, action: resource.default_context)
+      end
+    end
+  end
+  unless AdminIt.resources.empty?
+    name, resource = AdminIt.resources.first
+    get('/',
+        controller: "admin_it/#{name}",
+        action: resource.default_context)
+  end
+end

data/lib/admin_it/controller.rb

@@ -2,6 +2,8 @@ module AdminIt
   module Controller
     def self.included(base)
       base.class_eval do
+        include Pundit if AdminIt::Env.pundit?
+
         attr_reader :context
         helper_method :context, :resource
         helper AdminIt::Helpers

data/lib/admin_it/data/active_record.rb

@@ -233,7 +233,8 @@ module AdminIt
             if value.count == 0
               I18n.t('admin_it.collection.no_data')
             else
-              context.read(value.first) + ' ...'
+              v = context.read(value.first)
+              v.nil? ? '' : context.read(value.first) + ' ...'
             end
           else
             context.read(value)

data/lib/admin_it/engine.rb

@@ -8,7 +8,6 @@ module AdminIt
     config.to_prepare do
       Rails.application.config.i18n.load_path +=
         Dir[Engine.root.join('lib', 'admin_it', 'locales', '*.yml')]
-
       unless File.basename($0) == "rake" && ARGV.include?("db:migrate")
         Dir[File.join(AdminIt.config.root, '**', '*.rb')].each do |file|
           require file
@@ -16,32 +15,6 @@ module AdminIt
       end
 #      Assets.register(Rails.application.assets)
 
-#      AdminIt.init
-
-      Engine.routes.draw do
-        AdminIt.resources.each do |name, resource|
-          resources(resource.plural,
-                    controller: "admin_it/#{name}",
-                    except: [:index]) do
-            resource.collections.each do |context|
-              next unless context.collection?
-              get context.context_name, on: :collection
-            end
-            unless resource.collections.empty?
-              get('/', on: :collection, action: resource.default_context)
-            end
-          end
-        end
-        unless AdminIt.resources.empty?
-          name, resource = AdminIt.resources.first
-          get('/',
-              controller: "admin_it/#{name}",
-              action: resource.default_context)
-        end
-      end
-
-      #AdminIt.compile_menu
-
       ActionController::Base.module_eval do
         prepend_view_path 'lib/views'
       end

data/lib/admin_it/helpers/field.rb

@@ -14,8 +14,8 @@ module AdminIt
         end
         if field.is_a?(AdminIt::Field)
           entity = context.entity
+          body << html_safe(field.show(entity).to_s) if body.empty?
           field.render(entity, instance: self)
-          body << field.show(entity).to_s if body.empty?
         end
       end
     end

data/lib/admin_it/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admin_it
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Alexey Ovchinnikov
@@ -225,6 +225,7 @@ files:
 - app/views/layouts/admin_it.html.slim
 - app/views/layouts/admin_it_dialog.html.slim
 - config.ru
+- config/routes.rb
 - lib/admin_it.rb
 - lib/admin_it/config.rb
 - lib/admin_it/context.rb