c80_contest 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f616dabdda852134cf837b8aa51574041625b4f6
-  data.tar.gz: 972821f98c47129fd72de0c5b11a960bc6f6e58d
+  metadata.gz: b67512c64a0116f899791b232453e32c48fc92ec
+  data.tar.gz: b9403eff035448dc0de9302796d4dbe3d1da76db
 SHA512:
-  metadata.gz: 2c231ddf601ed7c56c9fd67d29eb199c017242152572a28c39be696ba6e09665ec3a4d910eccecbea920a063c56f66a78def88d8e09cbed6558cc55e5889cfe5
-  data.tar.gz: d821e43972126c194618e6c0518fc85e98eec98268ea21c76aba07e5372026d07c7f02a18f2fa1589d02cb5044b50e8ae25a5caa44318bc98b7685107baff02e
+  metadata.gz: 9dbe501af079144e075ec2c2a4ae824aa0e7e2eac9d15da047d37d105bef428ea9177c0c3b4ba30bfa9dac740687d93f8be8738baee59e88baff59f30258b22c
+  data.tar.gz: 5aa1e8fb39f208fee91bec4d783c5d7f237851ba10c62f5a7093da6bf9b3164dde9deb7b3d50dd981657b85ac76b6a464962a27b1f2fe012023d614955f7355c

data/app/admin/c80_contest/settings.rb

@@ -13,9 +13,15 @@ if defined?(ActiveAdmin)
     # noinspection RubyResolve
     before_filter :skip_sidebar!, :only => :index
 
+    # noinspection RubyResolve
+    config.clear_action_items!
+    config.batch_actions = false
+
     controller do
 
-      def update
+      actions :all, :except => [:show, :destroy]
+
+      def update # NOTE:: эта канитель нужна, т.к. activeadmin не хочет "из-коробки" апдейтить модель (при наличии namespace)
         setting = C80Contest::Setting.find(params[:id])
         permitted_params[:setting].each_key do |k|
           if k == 'button_photo'
@@ -24,7 +30,11 @@ if defined?(ActiveAdmin)
             setting.button_photo = permitted_params[:setting][k]
             setting.save!
           else
-            setting.update_column(k, permitted_params[:setting][k])
+            # NOTE:: но тогда не видны будут ошибки валидации, но зато не проходят невалидные записи
+            # setting.update_column(k, permitted_params[:setting][k])
+            setting.update({
+                               k.to_s => permitted_params[:setting][k]
+                           })
           end
         end
         # noinspection RailsParamDefResolve
@@ -95,9 +105,10 @@ if defined?(ActiveAdmin)
             sn = "#{tmp[0..129]}... <em style='color:#2b2b2b;'>(знаков с пробелами: ~#{s.size})</em> #{ah}"
           end
 
-          a += "<li><em>#{n}:</em>#{sn}</li>"
+          # NOTE:: не подхватываются стили в production в кое-каком старом проекте, inline их тут
+          a += "<li><em style='font-weight:bold;display:inline-block;width:200px;'>#{n}:</em>#{sn}</li>"
         end
-        "<ul>#{a}</ul>".html_safe
+        "<ul style='white-space:nowrap'>#{a}</ul>".html_safe
       end
 
       actions

data/app/assets/stylesheets/c80_contest/backend/settings_page.scss

@@ -1,6 +1,6 @@
 body.admin_c80_contest_settings {
 
-  #titlebar_right .action_items {
+  /*#titlebar_right .action_items {
     display: none;
   }
 
@@ -13,7 +13,7 @@ body.admin_c80_contest_settings {
   }
   a.delete_link {
     display: none;
-  }
+  }*/
 
   .blank_slate_container {
     opacity: 0;

data/db/seeds/c80_contest_fill_settings.rb

@@ -18,10 +18,10 @@ C80Contest::Setting.create!({
                                    :mail_from => 'robot@mail.ru',
                                    :mail_to => 'admin@mail.ru',
                                    :is_active => true,
-                                   :message_text => ' • Имя: {name}<br>' +
+                                   :message_text => ' • Имя: {title}<br>' +
                                        ' • Номер телефона: {phone}<br>' +
                                        ' • Фото чека: <br>' +
-                                       ' <img src="http://google.com/uploads/bids/{photo_url}" />' +
+                                       ' <img src="http://google.com/{photo_url}" /><br>' +
                                        ' --------------------------------------<br>' +
-                                       " Просмотреть заявку: <a href='http://google.com/admin/bids/{subj_id}'>http://google.com/admin/bids/{subj_id}</a><br>"
+                                       " Просмотреть заявку: <a href='http://google.com/admin/bids/{bid_id}'>http://google.com/admin/bids/{bid_id}</a><br>"
                                })

data/lib/c80_contest/version.rb

@@ -1,3 +1,3 @@
 module C80Contest
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: c80_contest
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - C80609A