c80_contest 0.1.3 → 0.1.4
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: b67512c64a0116f899791b232453e32c48fc92ec
|
|
4
|
+
data.tar.gz: b9403eff035448dc0de9302796d4dbe3d1da76db
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9dbe501af079144e075ec2c2a4ae824aa0e7e2eac9d15da047d37d105bef428ea9177c0c3b4ba30bfa9dac740687d93f8be8738baee59e88baff59f30258b22c
|
|
7
|
+
data.tar.gz: 5aa1e8fb39f208fee91bec4d783c5d7f237851ba10c62f5a7093da6bf9b3164dde9deb7b3d50dd981657b85ac76b6a464962a27b1f2fe012023d614955f7355c
|
|
@@ -13,9 +13,15 @@ if defined?(ActiveAdmin)
|
|
|
13
13
|
# noinspection RubyResolve
|
|
14
14
|
before_filter :skip_sidebar!, :only => :index
|
|
15
15
|
|
|
16
|
+
# noinspection RubyResolve
|
|
17
|
+
config.clear_action_items!
|
|
18
|
+
config.batch_actions = false
|
|
19
|
+
|
|
16
20
|
controller do
|
|
17
21
|
|
|
18
|
-
|
|
22
|
+
actions :all, :except => [:show, :destroy]
|
|
23
|
+
|
|
24
|
+
def update # NOTE:: эта канитель нужна, т.к. activeadmin не хочет "из-коробки" апдейтить модель (при наличии namespace)
|
|
19
25
|
setting = C80Contest::Setting.find(params[:id])
|
|
20
26
|
permitted_params[:setting].each_key do |k|
|
|
21
27
|
if k == 'button_photo'
|
|
@@ -24,7 +30,11 @@ if defined?(ActiveAdmin)
|
|
|
24
30
|
setting.button_photo = permitted_params[:setting][k]
|
|
25
31
|
setting.save!
|
|
26
32
|
else
|
|
27
|
-
|
|
33
|
+
# NOTE:: но тогда не видны будут ошибки валидации, но зато не проходят невалидные записи
|
|
34
|
+
# setting.update_column(k, permitted_params[:setting][k])
|
|
35
|
+
setting.update({
|
|
36
|
+
k.to_s => permitted_params[:setting][k]
|
|
37
|
+
})
|
|
28
38
|
end
|
|
29
39
|
end
|
|
30
40
|
# noinspection RailsParamDefResolve
|
|
@@ -95,9 +105,10 @@ if defined?(ActiveAdmin)
|
|
|
95
105
|
sn = "#{tmp[0..129]}... <em style='color:#2b2b2b;'>(знаков с пробелами: ~#{s.size})</em> #{ah}"
|
|
96
106
|
end
|
|
97
107
|
|
|
98
|
-
|
|
108
|
+
# NOTE:: не подхватываются стили в production в кое-каком старом проекте, inline их тут
|
|
109
|
+
a += "<li><em style='font-weight:bold;display:inline-block;width:200px;'>#{n}:</em>#{sn}</li>"
|
|
99
110
|
end
|
|
100
|
-
"<ul>#{a}</ul>".html_safe
|
|
111
|
+
"<ul style='white-space:nowrap'>#{a}</ul>".html_safe
|
|
101
112
|
end
|
|
102
113
|
|
|
103
114
|
actions
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
body.admin_c80_contest_settings {
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
/*#titlebar_right .action_items {
|
|
4
4
|
display: none;
|
|
5
5
|
}
|
|
6
6
|
|
|
@@ -13,7 +13,7 @@ body.admin_c80_contest_settings {
|
|
|
13
13
|
}
|
|
14
14
|
a.delete_link {
|
|
15
15
|
display: none;
|
|
16
|
-
}
|
|
16
|
+
}*/
|
|
17
17
|
|
|
18
18
|
.blank_slate_container {
|
|
19
19
|
opacity: 0;
|
|
@@ -18,10 +18,10 @@ C80Contest::Setting.create!({
|
|
|
18
18
|
:mail_from => 'robot@mail.ru',
|
|
19
19
|
:mail_to => 'admin@mail.ru',
|
|
20
20
|
:is_active => true,
|
|
21
|
-
:message_text => ' • Имя: {
|
|
21
|
+
:message_text => ' • Имя: {title}<br>' +
|
|
22
22
|
' • Номер телефона: {phone}<br>' +
|
|
23
23
|
' • Фото чека: <br>' +
|
|
24
|
-
' <img src="http://google.com/
|
|
24
|
+
' <img src="http://google.com/{photo_url}" /><br>' +
|
|
25
25
|
' --------------------------------------<br>' +
|
|
26
|
-
" Просмотреть заявку: <a href='http://google.com/admin/bids/{
|
|
26
|
+
" Просмотреть заявку: <a href='http://google.com/admin/bids/{bid_id}'>http://google.com/admin/bids/{bid_id}</a><br>"
|
|
27
27
|
})
|
data/lib/c80_contest/version.rb
CHANGED