inline_forms 5.2.8 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a117df1973d57dc7bc4a24cba91ea53a9d0106d
-  data.tar.gz: 2cdb3d94cd04d898234332d6f8b3f767dd1085a6
+  metadata.gz: b7294976b3ac09b7775c3a0a36925ce4ccb4f73f
+  data.tar.gz: 945113c29e712687c341ef479de35d5242096fca
 SHA512:
-  metadata.gz: ff6ff20c206a762c349591532f2c940541edfd195fcad998b07d0f51eef65d83be4f6076a4f582372e1d39ac8d58b46049f0029b574c78ded492f9de495f4631
-  data.tar.gz: 3f3083f8dd6eb734748ac2349528c297f81ac741c49fbbad327fb2caa054310865c9e20773a4129c0fb0290d87e59aeaf11c99b33655827a4daa0cebca3dbbf2
+  metadata.gz: 68737c524ed39ab962da6e43b95ba051e453795dd7f03add546a1145eb44cbda13a7204c786649313fdcec04de70b96001b06f729e34aec55518d2fccef8fe04
+  data.tar.gz: 2df74e31c2ee0b47e6d0d38c565cf889812e58c60ed851661db018b2140bb8955f2d084157c0c707a9b8086a8529953a691cc5098aa933c04e22f6a4e0d15a64

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/app/models/concerns/inline_forms/soft_deletable.rb

@@ -0,0 +1,35 @@
+module InlineForms::SoftDeletable
+  extend ActiveSupport::Concern
+
+# you need to put this in the model:
+#  include InlineForms::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 self.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/inline_forms.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rvm')
   s.add_dependency('thor')
   s.add_dependency('validation_hints')
-  s.add_dependency('rails', '>= 5.0')
+  s.add_dependency('rails', '>= 6.0')
   s.add_dependency('rails-i18n')
 
   s.add_development_dependency(%q<rspec-rails>)

data/lib/inline_forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 5.2.8
+  version: 6.0.5
 platform: ruby
 authors:
 - Ace Suares
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2020-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rvm
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +209,7 @@ files:
 - app/helpers/form_elements/text_field.rb
 - app/helpers/form_elements/time.rb
 - app/helpers/inline_forms_helper.rb
+- app/models/concerns/inline_forms/soft_deletable.rb
 - app/models/geo_code_curacao.rb
 - app/validators/curacao_id_number_validator.rb
 - app/validators/is_curacao_phone_validator.rb