effective_mergery 0.1 → 0.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b580838fafa8a15dc1721ef4d766aa83046cfea8
|
|
4
|
+
data.tar.gz: 6789c91eb0cb4ae0928c13baf92a37a2eadd8416
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7ffccb07c012a9504b798045095ff6aec833211ecf4a4943d2acf548b6aa1337ab8e475e8486894ed16af3b360a4c2fad87fad1bf2cea6a3ccd3121802174220
|
|
7
|
+
data.tar.gz: f14348e9496c74bd329cad1f24d48288d03919a1e056ebd23fc99363bc9fa6f88da02fa110e46d2a609c49577c4563b89e6e82701a05a553f47e8b790ce86f4c
|
|
@@ -3,3 +3,22 @@
|
|
|
3
3
|
.table-attributes { opacity: 0.4; }
|
|
4
4
|
}
|
|
5
5
|
}
|
|
6
|
+
|
|
7
|
+
.table-merge.table > thead > tr > th,
|
|
8
|
+
.table-merge.table > thead > tr > td,
|
|
9
|
+
.table-merge.table > tbody > tr > th,
|
|
10
|
+
.table-merge.table > tbody > tr > td,
|
|
11
|
+
.table-merge.table > tfoot > tr > th,
|
|
12
|
+
.table-merge.table > tfoot > tr > td {
|
|
13
|
+
padding: 0 5px 5px 5px;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
.effective-merge {
|
|
17
|
+
.encrypted_password,
|
|
18
|
+
.reset_password_token,
|
|
19
|
+
.confirmation_token,
|
|
20
|
+
.unique_session_id,
|
|
21
|
+
.invitation_token {
|
|
22
|
+
display: none;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
= tableize_hash(resource.attributes, table: 'table table-attributes')
|
|
1
|
+
= tableize_hash(resource.attributes, table: 'table table-merge table-attributes')
|
|
2
2
|
%hr
|
|
3
|
-
= tableize_hash(Effective::Resource.new(resource).instance_attributes.except(:attributes))
|
|
3
|
+
= tableize_hash(Effective::Resource.new(resource).instance_attributes.except(:attributes), table: 'table table-merge', sub_table: 'table table-merge table-subtable')
|
|
@@ -25,5 +25,5 @@
|
|
|
25
25
|
- if f.object.target.present?
|
|
26
26
|
= render partial: '/admin/merge/attributes', locals: { resource: f.object.target }
|
|
27
27
|
|
|
28
|
-
.
|
|
28
|
+
.form-actions
|
|
29
29
|
= f.button :submit, "Merge #{@merge}", data: { disable_with: 'Merging...', confirm: "Really merge? The source record will be destroyed."}
|
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:
|
|
4
|
+
version: 0.1.1
|
|
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-10 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|