inline_forms 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41ec2dde956377e84c7ae4cb228cac6098ad42f5
-  data.tar.gz: 6a4e558788cdf92506ac80918050a80e63a11591
+  metadata.gz: 7c6e41d884135a6e7124801d5cc33048e16b5542
+  data.tar.gz: 180fa9e1324cc7545daee4483f5011852d96989b
 SHA512:
-  metadata.gz: 79279055494c7c915500d0a73b618e35405e482d7b6531544bebc4b29b83bba96a18e9d529d508b57389ff8c3af168e38c24206a27daf622548451ae5214a7bf
-  data.tar.gz: 08db08a5be24d890abca786fc978fbf43954add84f8732e268ba16e7a95338d534d9a6022c9ac5956003c2d33fd81c289e8e8e4fba96228d974fc3c8ab7548b1
+  metadata.gz: d53f228b7ba478ce80348740f9210802ab3d503433f43a819ba1aba383ed07f2997404c2874370d95343c14fad5de8c5633376a0ba1fdc9539549696625e1111
+  data.tar.gz: df0c99e1ec6e24fdbb0cdefe80f626f601e7141bb35aa247ad24988800733995eb4e9cad97269289acdb6246a68f306ce29c462ec23e19f29fe64cffa5dbbd28

data/app/controllers/concerns/soft_deletable_concern.rb

@@ -0,0 +1,35 @@
+module SoftDeletable
+  extend ActiveSupport::Concern
+
+# you need to put this in the model:
+#  include SoftDeletable
+#  enum deleted: { active: 1, deleted: 2 }
+
+# you need a migration like this:
+# class AddDeletedAtColumnToUser < ActiveRecord::Migration[6.0]
+#   def change
+#     add_column :users, :deleted_at, :datetime, default: nil
+#     add_column :users, :deleted, :integer, default: 1
+#     add_column :users, :deleted_by, :integer, default: nil
+#   end
+# end
+
+  def soft_deletable?
+    true
+  end
+
+  def soft_delete(current_user)
+    deleted = 2
+    deleter = current_user
+    deleted_at = Time.current
+    save
+  end
+
+  def soft_restore
+    deleted = 1
+    deleted_by = nil
+    deleted_at = nil
+    save
+  end
+
+end

data/app/controllers/inline_forms_controller.rb

@@ -185,13 +185,21 @@ class InlineFormsController < ApplicationController
     @update_span = params[:update]
     @object = referenced_object
     if current_user.role? :superadmin
-      @object.destroy
-      respond_to do |format|
-        format.html { } unless @Klass.not_accessible_through_html?
-        format.js { render :show_undo }
+      if (@Klass.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 (@Klass.safe_deletable? rescue false)
-      @object.safe_delete(current_user)
+    elsif (@Klass.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 }
@@ -204,17 +212,26 @@ class InlineFormsController < ApplicationController
   def revert
     @update_span = params[:update]
     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.html { } unless @Klass.not_accessible_through_html?
-        format.js { render :close }
+      if (@Klass.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 (@Klass.safe_deletable? rescue false)
+    elsif (@Klass.soft_deletable? rescue false)
       @object = referenced_object
-      @object.safe_restore
+      @object.soft_restore
       respond_to do |format|
         format.html { } unless @Klass.not_accessible_through_html?
         format.js { render :close }

data/lib/inline_forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Ace Suares
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -163,6 +163,7 @@ files:
 - app/assets/stylesheets/inline_forms/foundation_and_overrides.scss
 - app/assets/stylesheets/inline_forms/inline_forms.scss
 - app/controllers/concerns/cancan_concern.rb
+- app/controllers/concerns/soft_deletable_concern.rb
 - app/controllers/concerns/versions_concern.rb
 - app/controllers/geo_code_curacao_controller.rb
 - app/controllers/inline_forms_application_controller.rb