inline_forms 6.0.6 → 6.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 54a5764d56a4e64abf5430fd36f3775b81948572
-  data.tar.gz: 8905f7da726c3130ad6b2be767447b6570e4a48d
+SHA256:
+  metadata.gz: e7267f675ac24a67ee56986b7d2f85500b1f194ee15f395a87b076b4f5a7a7aa
+  data.tar.gz: 8d7a638344ccbb689a0acee88b87c12a6121823cc23753ee8c02d943366ccc60
 SHA512:
-  metadata.gz: 73efb75e7a5b9ca0d63925e903036201d4cbffa788dd39d81aff02ecc39ded8cdee0e5f6e5eab0754f8a37927b6b3d7169a9300fbc40c52d22c8670acf2bdde1
-  data.tar.gz: d5fac7a763a91cb96e9be78b83a97d8976b026ff8e38c6ead30c5acd680fa58ef2248a6011d1b600ecdd12b7e69e9b7171e680891baefcefb39a1849d6888e4b
+  metadata.gz: 4e4cb6691bf8ce4eb74ea1b598fa6c83c5a7bbd115ae5f40a5f51b24ad82be7567f26fb36db7c61d41383b9d9c42b3bc141a571f90e5b3baabbfa762c749d269
+  data.tar.gz: 426095cd3c2fb78a117e90a0743bbd8723f4e735249b8fd1af15ec221b10edb3e8fe923f26794e4e9aeef9323b8d727d2d1fd11c63986e99f6d1a588c2c6c231

data/app/controllers/inline_forms_controller.rb

@@ -180,29 +180,41 @@ class InlineFormsController < ApplicationController
     end
   end
 
-  # :destroy destroys the record, but also shows an undo link (with paper_trail)
+  # :soft_delete
+  def soft_delete
+    @update_span = params[:update]
+    @object = referenced_object
+    # destroy the object
+    @object.soft_delete(current_user)
+    respond_to do |format|
+      format.html { } unless @Klass.not_accessible_through_html?
+      format.js { render :close }
+    end
+  end
+
+  # :soft_restore
+  def soft_restore
+    @update_span = params[:update]
+    @object = referenced_object
+    # restore the object
+    @object.soft_restore
+    respond_to do |format|
+      format.html { } unless @Klass.not_accessible_through_html?
+      format.js { render :close }
+    end
+  end
+
+  # :destroy destroys the record. There is no undo!
   def destroy
     @update_span = params[:update]
     @object = referenced_object
     if current_user.role? :superadmin
-      if (@object.soft_deletable? rescue false)
-        @object.soft_delete(current_user)
-        respond_to do |format|
-          format.html { } unless @Klass.not_accessible_through_html?
-          format.js { render :close }
-        end
-      elsif
-        @object.destroy
-        respond_to do |format|
-          format.html { } unless @Klass.not_accessible_through_html?
-          format.js { render :show_undo }
-        end
-      end
-    elsif (@object.soft_deletable? rescue false)
-      @object.soft_delete(current_user)
+      # destroy the object
+      @undo_object = @object.versions.last
+      @object.destroy
       respond_to do |format|
         format.html { } unless @Klass.not_accessible_through_html?
-        format.js { render :close }
+        format.js { render :record_destroyed }
       end
     end
   end
@@ -211,27 +223,12 @@ class InlineFormsController < ApplicationController
   # Thanks Ryan Bates: http://railscasts.com/episodes/255-undo-with-paper-trail
   def revert
     @update_span = params[:update]
+    @object = referenced_object
     if current_user.role? :superadmin
-      if (@object.soft_deletable? rescue false)
-        @object = referenced_object
-        @object.soft_restore
-        respond_to do |format|
-          format.html { } unless @Klass.not_accessible_through_html?
-          format.js { render :close }
-        end
-      elsif
-        @version = PaperTrail::Version.find(params[:id])
-        @version.reify.save!
-        @object = @Klass.find(@version.item_id)
-        authorize!(:revert, @object) if cancan_enabled?
-        respond_to do |format|
-          format.html { } unless @Klass.not_accessible_through_html?
-          format.js { render :close }
-        end
-      end
-    elsif (@object.soft_deletable? rescue false)
-      @object = referenced_object
-      @object.soft_restore
+      @version = PaperTrail::Version.find(params[:id])
+      @version.reify.save!
+      @object = @Klass.find(@version.item_id)
+      authorize!(:revert, @object) if cancan_enabled?
       respond_to do |format|
         format.html { } unless @Klass.not_accessible_through_html?
         format.js { render :close }

data/app/helpers/inline_forms_helper.rb

@@ -30,37 +30,44 @@ module InlineFormsHelper
       :title => t('inline_forms.view.close')
   end
 
-  # destroy link
-  def link_to_destroy( object, update_span )
-    if current_user.role? :superadmin
-      if cancan_disabled? || ( can? :delete, object )
-        link_to "<i class='fi-trash'></i>".html_safe,
-          send( object.class.to_s.underscore + '_path',
-          object,
-          :update => update_span ),
-          :method => :delete,
-          :remote => true,
-          :title => t('inline_forms.view.trash')
-      end
-    elsif (object.class.safe_deletable? rescue false)
-      if object.deleted?     && (cancan_disabled? || ( can? :revert, object ))
-        link_to "undelete".html_safe,
-          send( 'revert_' + object.class.to_s.underscore + '_path',
+  # delete link. Mind the difference between delete and destroy.
+  def link_to_soft_delete( object, update_span )
+    soft=''
+    if (object.soft_deletable? rescue false)
+      if object.deleted?     && (cancan_disabled? || ( can? :soft_restore, object ))
+        soft = link_to "<i class='fi-refresh'></i>".html_safe,
+          send( 'soft_restore_' + object.class.to_s.underscore + '_path',
           object,
           :update => update_span ),
           :method => :post,
           :remote => true,
-          :title => t('inline_forms.view.trash')
-      elsif !object.deleted? && (cancan_disabled? || ( can? :delete, object ))
-        link_to "<i class='fi-trash'></i>".html_safe,
-          send( object.class.to_s.underscore + '_path',
-          object,
-          :update => update_span ),
-          :method => :delete,
-          :remote => true,
-          :title => t('inline_forms.view.trash')
+          :title => t('inline_forms.view.undelete')
+      elsif !object.deleted? && (cancan_disabled? || ( can? :soft_delete, object ))
+        soft = link_to "<i class='fi-trash'></i>".html_safe,
+        send( 'soft_delete_' + object.class.to_s.underscore + '_path',
+        object,
+        :update => update_span ),
+        :method => :post,
+        :remote => true,
+        :title => t('inline_forms.view.trash')
       end
     end
+    soft.html_safe
+  end
+
+  # destroy link. Mind the difference between delete and destroy.
+  def link_to_destroy( object, update_span )
+    hard=''
+    if cancan_disabled? || ( can? :destroy, object )
+      hard = link_to "&nbsp;&nbsp;<font color='FF0000'><i class='fi-x'></i></font>".html_safe,
+        send( object.class.to_s.underscore + '_path',
+        object,
+        :update => update_span ),
+        :method => :delete,
+        :remote => true,
+        :title => t('inline_forms.view.trash')
+    end
+    hard.html_safe
   end
 
   # new link

data/app/views/inline_forms/_close.html.erb

@@ -1,5 +1,6 @@
-<% if cancan_disabled? || ( can? :delete, @object ) %>
+<% if cancan_disabled? || ( can? :soft_delete, @object ) %>
   <div  class="small-1 column">
+    <%= link_to_soft_delete(@object, @update_span) -%>
     <%= link_to_destroy(@object, @update_span) -%>
   </div>
   <div  class="small-11 column">

data/app/views/inline_forms/_list.html.erb

@@ -53,8 +53,9 @@
     <% path_to_object = attribute.to_s.singularize.underscore + "_path" %>
   <% end %>
   <div class="row <%= cycle('odd', 'even') %><%= " top-level" if parent_class.nil? %>" id="<%= css_class_id -%>">
-    <% if cancan_disabled? || ( can? :delete, object ) %>
+    <% if cancan_disabled? || ( can? :soft_delete, object ) %>
       <div  class="small-1 column">
+        <%= link_to_soft_delete(object, css_class_id) -%>
         <%= link_to_destroy(object, css_class_id) -%>
       </div>
       <div  class="small-11 column">

data/app/views/inline_forms/record_destroyed.js.erb

@@ -0,0 +1 @@
+$('#<%= @update_span %>').fadeOut("slow")

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "6.0.6"
+  VERSION = "6.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 6.0.6
+  version: 6.0.7
 platform: ruby
 authors:
 - Ace Suares
@@ -10,132 +10,132 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: validation_hints
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Inline Forms aims to ease the setup of forms that provide inline editing.
@@ -149,9 +149,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .vscode/settings.json
+- ".document"
+- ".gitignore"
+- ".vscode/settings.json"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -246,6 +246,7 @@ files:
 - app/views/inline_forms/extract_translations.erb
 - app/views/inline_forms/list.js.erb
 - app/views/inline_forms/new.js.erb
+- app/views/inline_forms/record_destroyed.js.erb
 - app/views/inline_forms/show.js.erb
 - app/views/inline_forms/show_element.js.erb
 - app/views/inline_forms/show_undo.js.erb
@@ -299,17 +300,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: inline_forms
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Inline editing of forms.