admin_it 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3a63565c2793d51ed2992d7d4e01deeecc68543
-  data.tar.gz: 2fe03cded06fe4a4fedc76b2244f727a9dfaa876
+  metadata.gz: c69b40dfe779b858729883eea07b1077f74216b4
+  data.tar.gz: 7ba60b0a798165f512348b509411fffad8f1d17f
 SHA512:
-  metadata.gz: 1cc3714caf30a63432ca69c6bed8ab1e6b01947918b6f7024daeb9a8951fbd026c1ec7ede09037b61386f0622e2971f0d1b2ae25a9c5532125bebb5169bc647b
-  data.tar.gz: ed25582af138eca0e80f23b1e2205880b4a74bc6ad830c74adf027ebfcf6eed05407e0180b14e2f15b074df284ba1362bf16b75f9c5f79d3f33ce8516431f4b9
+  metadata.gz: 7a55e137e2e089570a4a00faeeee9eeb1cc38657b5055b3153d304e785a1b6109cf1a1281b9e525ab9185d4c04c3906105711678f573bee09d5fe43d2b1a7452
+  data.tar.gz: 7bbfd6ff962a80ac79adeb880730693c072d5b003828f5d6c27d9b2dbd9da95e6154752d63689557de88f908760f2834032052c1a1e0cd587aa07d15597b33d6

data/README.md

@@ -38,6 +38,12 @@ bundle install
 
 # Changes
 
+`1.0.7`
+
+* destoy entity fixed
+* delete confirmation added
+* simple record editing and creating fixed
+
 `1.0.6`
 
 * fixed: [#1](/../../issues/1)

data/README_RU.md

@@ -37,6 +37,24 @@ bundle install
 
 # Изменения
 
+`1.0.7`
+
+* исправлено удаление записей
+* добавлено подтверждение удаления
+* налажено редактирование и создание простых записей
+
+`1.0.6`
+
+* исправлено: [#1](/../../issues/1)
+
+`1.0.5`
+
+* исправлено: font-awesome asset path
+
+`1.0.4`
+
+* исправлено: font-awesome
+
 `1.0.3`
 
 * исправлено: assets

data/app/assets/javascript/admin_it/admin_it.js

@@ -70,20 +70,12 @@ var initLinks = function() {
   });
 }
 
-var initFilters = function() {
-  $('[data-filter-values]').each(function(idx, container) {
-    $.each($(container).data().filterValues, function(i, v) {
-      var html = "<a class='label label-success' href='#'>" + v.value + ' ' + "<span class='badge'>" + v.count + "</span></a>";
-      $(container).append(html);
-    });
-  });
-}
-
 $(document).on('ready page:load', function() {
   initPartials();
   initTiles();
   initTabs();
   initPopups();
   initLinks();
-//  initFilters();
+  // allow dialog content reloading
+  $('.modal').on('hidden.bs.modal', function() { $(this).removeData(); })
 });

data/app/views/admin_it/context/_show.html.slim

@@ -0,0 +1,38 @@
+- for_context ||= context
+
+- content_for :title do
+  - if for_context.confirm?
+    - if for_context.confirm == :destroy
+      span class="text-danger"
+        i class="fa fa-exclamation-triangle"
+        = ' ' + t('admin_it.destroying')
+  - else
+    = t('admin_it.details')
+
+- if for_context.layout.empty?
+  h4 = yield :title
+
+- if for_context.confirm?
+  - if for_context.confirm == :destroy
+    p = t('admin_it.confirm.destroy.header')
+
+dl class="dl-horizontal"
+  - for_context.fields.each do |f|
+    - next if f.type == :relation
+    dt = f.display_name
+    = field f, tag: 'dl'
+div class="clearfix"
+
+- if for_context.confirm?
+  - if for_context.confirm == :destroy
+    p = t('admin_it.confirm.destroy.text')
+
+- content_for :buttons do
+  - if for_context.confirm?
+    - if for_context.confirm == :destroy
+      = link_to( \
+          '<i class="fa fa-trash-o"></i> '.html_safe + t('admin_it.action.destroy'),
+          for_context.path, \
+          method: :delete, \
+          class: 'btn btn-danger' \
+        )

data/app/views/admin_it/context/_table.html.slim

@@ -36,3 +36,7 @@
 
 = render partial: File.join(%w(admin_it shared pagination)), \
          locals: { for_context: for_context }
+
+div class="modal fade" id="confirm_modal"
+  div class="modal-dialog"
+    div class="modal-content"

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

@@ -44,7 +44,7 @@ form(
   - content_for :buttons do
     button class="btn btn-primary" = t('admin_it.action.save')
 
-  - if context.layout == ''
+  - if for_context.layout.empty?
     div class="form-group"
       div class="col-sm-10 col-sm-offset-2"
         = yield :buttons

data/app/views/admin_it/show.html.slim

@@ -1,6 +1,2 @@
 - context.begin_render(self)
-dl class="dl-horizontal"
-  - context.fields.each do |f|
-    - next if f.type == :relation
-    dt = f.display_name
-    = field f.read(context.entity), f, tag: 'dl'
+= render File.join %w(admin_it context show)

data/app/views/layouts/admin_it_dialog.html.slim

@@ -1,5 +1,5 @@
 div class="modal-header"
-  h4.modal-title title
+  h4.modal-title = yield :title
 div class="modal-body"
   = yield
 div class="modal-footer"

data/lib/admin_it/context/context.rb

@@ -23,6 +23,7 @@ module AdminIt
         value.nil? ? default_icon : value.to_s
       end
       dsl_use_hash :fields
+      dsl_boolean :confirm_destroy
     end
 
     inherited_class_reader :resource, :entity_class
@@ -35,6 +36,7 @@ module AdminIt
         @resource = _resource
         @context_name = context_name
         @entity_class = @resource.entity_class
+        @confirm_destroy = @resource.confirm_destroy?
 
         import_data_module(base)
 
@@ -91,7 +93,7 @@ module AdminIt
     end
 
     class_attr_reader :collection?, :single?, :entity_class, :resource, :icon,
-                      :entity_path?
+                      :entity_path?, :confirm_destroy?
     attr_reader :top_menu, :toolbar, :parent, :template, :controller
 
     CONTEXT_REGEXP = /\A

data/lib/admin_it/context/show_context.rb

@@ -2,6 +2,8 @@ module AdminIt
   class ShowContext < SingleContext
     include Identifiable
 
+    CONFIRMS = %i(destroy update)
+
     class << self
       include Renderable
 
@@ -24,6 +26,22 @@ module AdminIt
       end
     end
 
+    attr_reader :confirm
+
+    after_load do |store: {}, params: {}|
+      self.confirm = params[:confirm]
+    end
+
+    def confirm=(value)
+      value = value.downcase.to_sym if value.is_a?(String)
+      return unless value.is_a?(Symbol) && CONFIRMS.include?(value)
+      @confirm = value
+    end
+
+    def confirm?
+      !@confirm.nil?
+    end
+
     def destroy_entity
       if entity_destroyer.nil?
         if controller.respond_to?("#{resource.name}_destroy")
@@ -31,7 +49,7 @@ module AdminIt
         elsif controller.respond_to?(:destroy_entity)
           controller.destroy_entity(entity_class)
         else
-          destroy
+          do_destroy_entity
         end
       else
         entity_destroyer.call(controller)
@@ -40,6 +58,6 @@ module AdminIt
 
     protected
 
-    def destroy; end
+    def do_destroy_entity; end
   end
 end

data/lib/admin_it/context/single_context.rb

@@ -147,7 +147,7 @@ module AdminIt
         elsif controller.respond_to?(:save)
           controller.save(entity_class, name)
         else
-          save_entity
+          do_save_entity
         end
       else
         entity_saver.call(controller, name)
@@ -158,7 +158,7 @@ module AdminIt
 
     protected
 
-    def save_entity; end
+    def do_save_entity; end
   end
 
   class EditContext < SavableSingleContext

data/lib/admin_it/data/active_record.rb

@@ -105,7 +105,7 @@ module AdminIt
     module SavableSingleContext
       protected
 
-      def save_entity
+      def do_save_entity
         if AdminIt::Env.pundit?
           controller.authorize(entity, "#{self.class.save_action}?")
         end
@@ -165,7 +165,7 @@ module AdminIt
 
       protected
 
-      def destroy
+      def do_destroy_entity
         if AdminIt::Env.pundit?
           controller.authorize(entity, :destroy?)
         end
@@ -214,7 +214,11 @@ module AdminIt
       def read_value(entity)
         value = entity.send(name)
         if type == :relation
-          assoc.collection? ? value.map(&:id).to_json : value.id
+          if assoc.collection?
+            value.nil? || value.empty? ? [] : value.map(&:id).to_json
+          else
+            value.nil? ? nil : value.id
+          end
         else
           value
         end

data/lib/admin_it/helpers/table.rb

@@ -20,25 +20,47 @@ module AdminIt
       default_tag 'td'
 
       before_capture do
-        single = parent.parent.resource.singles.select { |c| !(c <= NewContext) }
-        buttons = single.map do |context|
-            cl = context <= ShowContext ? 'info' : 'default'
-            href = context.path(parent.parent.context.entity)
+        context = parent.parent.context
+        entity = context.entity
+        resource = parent.parent.resource
+        single = resource.singles.select { |c| !(c <= NewContext) }
+        buttons = single.map do |_context|
+            cl = _context <= ShowContext ? 'info' : 'default'
+            href = _context.path(entity)
             "<a class=\"btn btn-xs btn-#{cl}\" href=\"#{href}\">" \
-            "<i class=\"fa fa-#{context.icon}\"></i></a>"
+            "<i class=\"fa fa-#{_context.icon}\"></i></a>"
+          end
+        if resource.destroyable?
+          if context.confirm_destroy?
+            confirm = single.find { |c| c.context_name == :confirm } ||
+                      single.first { |c| c <= ShowContext }
+            buttons << if confirm.nil?
+              @template.link_to(
+                html_safe('<i class="fa fa-trash-o"></i>'),
+                show.path(entity),
+                method: :delete,
+                confirm: I18n.t('admin_it.confirm.destroy.text'),
+                class: 'btn btn-xs btn-danger'
+              )
+            else
+              '<a class="btn btn-xs btn-danger" ' +
+              %Q{data-toggle="modal" data-target="#confirm_modal" } +
+              %Q{href="#{confirm.path(entity)}} +
+              '?layout=dialog&confirm=destroy">' +
+              '<i class="fa fa-trash-o"></i></a>'
+            end
+          else
+            buttons << @template.link_to(
+              html_safe('<i class="fa fa-trash-o"></i>'),
+              show.path(entity),
+              method: :delete,
+              class: 'btn btn-xs btn-danger'
+            )
           end
-        show = single.first { |c| c <= ShowContext }
-        unless show.nil?
-          buttons << @template.link_to(
-            html_safe('<i class="fa fa-trash-o"></i>'),
-            show.path(parent.parent.context.entity),
-            method: :delete,
-            class: 'btn btn-xs btn-danger'
-          )
         end
 
         html = buttons.join
-        html = "<div class=\"btn-group\">#{html}</dic>" if buttons.size > 1
+        html = "<div class=\"btn-group\">#{html}</div>" if buttons.size > 1
 
         self[:content] = html_safe(html)
       end

data/lib/admin_it/locales/en.yml

@@ -11,4 +11,11 @@ en:
       create: 'Create'
       save: 'Save'
       close: 'Close'
-    filters: 'FIlters'
+      destroy: 'Delete'
+    filters: 'Filters'
+    details: 'Details'
+    destroying: 'Deletion'
+    confirm:
+      destroy:
+        header: 'You are going to delete following record:'
+        text: 'Please, confirm deletion'

data/lib/admin_it/locales/ru.yml

@@ -11,4 +11,11 @@ ru:
       create: 'Создать'
       save: 'Сохранить'
       close: 'Закрыть'
+      destroy: 'Удалить'
     filters: 'Фильтры'
+    details: 'Подробная информация'
+    destroying: 'Удаление'
+    confirm:
+      destroy:
+        header: 'Вы собираетесь удалить следующую запись:'
+        text: 'Подтвердите удаление'

data/lib/admin_it/resource.rb

@@ -55,6 +55,7 @@ module AdminIt
 
     dsl_accessor :icon
     dsl_use_hash :fields
+    dsl_boolean :confirm_destroy
 
     define_callbacks :initialize
 
@@ -202,7 +203,7 @@ module AdminIt
     end
 
     def define_controller
-      c_name = "#{name.to_s.camelize}Controller" # !POTABLE
+      c_name = "#{name.to_s.camelize}Controller" # !PORTABLE
       resource = self
       c_class = Class.new(AdminIt.config.controller) do
         @resource = resource
@@ -213,14 +214,14 @@ module AdminIt
 
           if _context < SavableSingleContext
             define_method _context.save_action do
-              load_context(_context) { context.save_entity(self) }
+              load_context(_context) { context.save_entity }
             end
           end
         end
 
         if resource.destroyable?
           define_method :destroy do
-            load_context(resource[:show]) { context.destroy_entity(self) }
+            load_context(resource[:show]) { context.destroy_entity }
           end
         end
       end

data/lib/admin_it/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: admin_it
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Alexey Ovchinnikov
@@ -209,6 +209,7 @@ files:
 - app/assets/stylesheets/admin_it/bootstrap-theme.min.css
 - app/assets/stylesheets/admin_it/bootstrap.min.css
 - app/assets/stylesheets/admin_it/font-awesome.min.css.erb
+- app/views/admin_it/context/_show.html.slim
 - app/views/admin_it/context/_table.html.slim
 - app/views/admin_it/context/_tiles.html.slim
 - app/views/admin_it/edit.html.slim