carnival 0.0.57 → 0.0.58
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1346dd050b9e221e49ae1abd84fd278f97857acc
|
4
|
+
data.tar.gz: bb7f3a66a939ae1d5dd4c4a4d844b515e59ff1e8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: bcdbd00f3a4dc5ddcbf932db7fce41a5b192ed7a3d40ab229903a61b31038c4a5d5b59272423e7e84b7989ced7cfc1c73d3d4c44ba9a549069ac04dfa552a198
|
7
|
+
data.tar.gz: 89815ce7b49cc4d570d43ccaf7b724e087a9d8d6b3ca9f6c59edf5500f7af0bb447f84f86c3b07fbaef5c25a3e25c5bbeb00730fba1b4254517b45b02546794e
|
@@ -24,6 +24,6 @@ class CarnivalSelectRemoteInput < SimpleForm::Inputs::CollectionSelectInput
|
|
24
24
|
{prompt: I18n.t("#{@builder.object.class.to_s.gsub(/^.*::/, '').downcase}.lista_#{attribute_name}.selecione", default: I18n.t("messages.select"))},
|
25
25
|
input_html_options
|
26
26
|
)
|
27
|
-
"<div class='select2-remote-div' #{data_options} ><input class='select2-remote
|
27
|
+
"<div class='select2-remote-div' #{data_options} ><input class='select2-remote' value='select'></input>#{html.to_s}</div>".html_safe
|
28
28
|
end
|
29
29
|
end
|
data/lib/carnival/version.rb
CHANGED
@@ -20,7 +20,10 @@ module Admin
|
|
20
20
|
|
21
21
|
field :country,
|
22
22
|
:actions => [:index, :new, :edit, :show],
|
23
|
-
|
23
|
+
<<<<<<< HEAD
|
24
|
+
=======
|
25
|
+
:as => {:carnival_select_remote => {:search_field => :name}},
|
26
|
+
>>>>>>> v0.0.56-remote-select
|
24
27
|
:advanced_search => {:operator => :equal}
|
25
28
|
|
26
29
|
field :cities,
|
@@ -28,11 +31,7 @@ module Admin
|
|
28
31
|
:show_as_list => true,
|
29
32
|
:nested_form => true,
|
30
33
|
:nested_form_allow_destroy => true,
|
31
|
-
<<<<<<< HEAD
|
32
34
|
nested_form_modes: [:associate]
|
33
|
-
=======
|
34
|
-
nested_form_modes: [:new]
|
35
|
-
>>>>>>> v0.0.56-remote-select
|
36
35
|
|
37
36
|
field :created_at, :actions => [:index, :show]
|
38
37
|
field :updated_at, :actions => [:index, :show]
|