inline_forms 3.1.9 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce5cb9c2699822e596b7438e280b91102835e2ce
-  data.tar.gz: 9fc5b25506589429b51c37fad4afc74e024abbc5
+  metadata.gz: b37424b939adb9381a5052834c8d5bd4b1d667d2
+  data.tar.gz: 2bb9b00f6b6403db88be0999afb68578beda7856
 SHA512:
-  metadata.gz: f7021ce11b9d039192aeed7fd4bfb48448f8f5794b28c0ebc45c1a5a690a0934a84346cd47b50467f1c8087ee919e1bbc4b460a8a152dfe9ba29bf42f78bbb0c
-  data.tar.gz: 57f2a5dfaa45b1ba0d2b77000362df00101df73b4db4a126478318b3e1323e992bcbbbb3569ba4fd2ea4808e6227fee44f3581284c8de89b51834f367707fb74
+  metadata.gz: d33062038a1812ed6b57469ec5e7f3c99276a73f269e80b7e2950a18a361ae94d7c4759e0aab9f43981bfb8547252b96502af195262bab83a7630085d8b7840d
+  data.tar.gz: 16a70f235d23f49f2685a6a4c7030eea768fb43cd288d6fa1c5243a90986f0845ae677bb04067fd84c8854164459c1934f2f20696e8b7f0ae64b62ed4e87c794

data/lib/app/controllers/inline_forms_controller.rb

@@ -197,9 +197,16 @@ class InlineFormsController < ApplicationController
   def destroy
     @update_span = params[:update]
     @object = @Klass.find(params[:id])
-    @object.destroy
-    respond_to do |format|
-      format.js { render :show_undo }
+    if current_user.role? :superadmin
+      @object.destroy
+      respond_to do |format|
+        format.js { render :show_undo }
+      end
+    elsif (@Klass.safe_deletable? rescue false)
+      @object.safe_delete(current_user)
+      respond_to do |format|
+        format.js { render :close }
+      end
     end
   end
 
@@ -207,12 +214,20 @@ class InlineFormsController < ApplicationController
   # Thanks Ryan Bates: http://railscasts.com/episodes/255-undo-with-paper-trail
   def revert
     @update_span = params[:update]
-    @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.js { render :close }
+    if current_user.role? :superadmin
+      @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.js { render :close }
+      end
+    elsif (@Klass.safe_deletable? rescue false)
+      @object = @Klass.find(params[:id])
+      @object.safe_restore
+      respond_to do |format|
+        format.js { render :close }
+      end
     end
   end
 

data/lib/app/helpers/inline_forms_helper.rb

@@ -32,14 +32,34 @@ module InlineFormsHelper
 
   # destroy link
   def link_to_destroy( object, update_span )
-    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')
+    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',
+          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')
+      end
     end
   end
 

data/lib/inline_forms/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 3.1.9
+  version: 3.2.0
 platform: ruby
 authors:
 - Ace Suares
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm