effective_mergery 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b580838fafa8a15dc1721ef4d766aa83046cfea8
-  data.tar.gz: 6789c91eb0cb4ae0928c13baf92a37a2eadd8416
+  metadata.gz: 7922291a6535bd2af2889d85cac2efbc752e91e4
+  data.tar.gz: 336c05b1877392c6a80745c6babcb2a1904eef21
 SHA512:
-  metadata.gz: 7ffccb07c012a9504b798045095ff6aec833211ecf4a4943d2acf548b6aa1337ab8e475e8486894ed16af3b360a4c2fad87fad1bf2cea6a3ccd3121802174220
-  data.tar.gz: f14348e9496c74bd329cad1f24d48288d03919a1e056ebd23fc99363bc9fa6f88da02fa110e46d2a609c49577c4563b89e6e82701a05a553f47e8b790ce86f4c
+  metadata.gz: b505d67ebe8cc3c508c0866b788e558c9465fa77138823ea64758cef0cc8ec1b39772b25b902790651cf9016685949505c41285d378594a68fdb3b4cbb1d7d78
+  data.tar.gz: d3fbb1258801e743d1dec0d3ff9a431c3372ef76db7170e1c3eb9660f12b1f3a1a3004f4a7db57a546a54d51530a2ff1637d9c69acbdc1fdd03c228ea7d8719f

data/app/controllers/admin/merge_controller.rb

@@ -31,6 +31,10 @@ module Admin
         @page_title = 'Successful Merge'
         flash[:success] = "Successfully merged #{@merge}"
 
+        if defined?(EffectiveLogging)
+          EffectiveLogger.success "Merged #{@merge}", user: (current_user rescue false), associated: @merge.target, source_id: @merge.source_id, target_id: @merge.target_id, mergable_type: @merge.type
+        end
+
         @merge.target = @merge.collection.find(@merge.target_id)
       else
         @page_title = 'New Merge'

data/app/models/effective/merge.rb

@@ -34,7 +34,11 @@ module Effective
     end
 
     def collection
-      @collection ||= (klass.respond_to?(:sorted) ? klass.sorted : klass.all)
+      @collection ||= (klass.respond_to?(:effective_mergery_collection) ? klass.effective_mergery_collection : klass.all)
+    end
+
+    def form_collection
+      @form_collection ||= (klass.respond_to?(:effective_mergery_form_collection) ? klass.effective_mergery_form_collection : collection)
     end
 
     def klass

data/app/views/admin/merge/new.html.haml

@@ -9,11 +9,11 @@
     .row
       .col-sm-6
         = f.input :source_id, as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
-          collection: f.object.collection,
+          collection: f.object.form_collection,
           hint: 'This record will be destroyed'
       .col-sm-6
         = f.input :target_id, as: (defined?(EffectiveFormInputs) ? :effective_select : :select),
-          collection: f.object.collection,
+          collection: f.object.form_collection,
           hint: 'This record will be kept'
 
     .row

data/lib/effective_mergery/version.rb

@@ -1,3 +1,3 @@
 module EffectiveMergery
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_mergery
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Code and Effect