effective_mergery 0.1.2 → 0.1.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/admin/merge_controller.rb +10 -1
- data/lib/effective_mergery/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: fa0266aea59888bb91fe9f432df263bd3a4d59da
|
|
4
|
+
data.tar.gz: 5c3e98a63f9652d832f05740a4881e3b6d7424bf
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 497e5931828591453996d91606135b3aa9836819da5c92256a8196fb29234fc1d9c7079f2f38215f0f5128b6d4d9b00ad3c6482e21b1b8983544ec31f9222038
|
|
7
|
+
data.tar.gz: 89900d334b0d29f4199c5e09d72c0a6678d2c835ebc20ccd170b9f0eb5aadb704cdbb8319776c5ab30545738ae8fecf4285ed2a08a6ebfef628cd14a819ab3ed
|
|
@@ -32,7 +32,16 @@ module Admin
|
|
|
32
32
|
flash[:success] = "Successfully merged #{@merge}"
|
|
33
33
|
|
|
34
34
|
if defined?(EffectiveLogging)
|
|
35
|
-
EffectiveLogger.success
|
|
35
|
+
EffectiveLogger.success(
|
|
36
|
+
"Merged #{@merge} - #{@merge.source.respond_to?(:to_s_verbose) ? @merge.source.to_s_verbose : @merge.source.to_s}",
|
|
37
|
+
user: (current_user rescue false),
|
|
38
|
+
associated: @merge.target,
|
|
39
|
+
source_id: @merge.source_id,
|
|
40
|
+
target_id: @merge.target_id,
|
|
41
|
+
mergable_type: @merge.type,
|
|
42
|
+
source_email: (@merge.source.email if @merge.source.respond_to?(:email)),
|
|
43
|
+
source_name: (@merge.source.full_name if @merge.source.respond_to?(:full_name))
|
|
44
|
+
)
|
|
36
45
|
end
|
|
37
46
|
|
|
38
47
|
@merge.target = @merge.collection.find(@merge.target_id)
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: effective_mergery
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Code and Effect
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-07-
|
|
11
|
+
date: 2017-07-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|