Merge branch 'release/0.15.0.8'

ulmic · Mar 23, 2017 · a7ecd6f · a7ecd6f
2 parents d31e074 + 1a4b7b5
commit a7ecd6f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/app/models/delivery/campaign.rb b/app/models/delivery/campaign.rb
@@ -48,7 +48,7 @@ def fill_audiences?
   end
 
   def fill_receivers!
-    (contacts.map(&:id) | receivers.map(&:user_id)).each do |user_id|
+    (contacts.map(&:id) - receivers.map(&:user_id)).each do |user_id|
       ::Delivery::Receiver.create! user_id: user_id, campaign_id: id
     end
   end

diff --git a/app/views/web/admin/delivery/campaigns/show.html.haml b/app/views/web/admin/delivery/campaigns/show.html.haml
@@ -46,3 +46,7 @@
               = audience_path audience
             %td
               = link_to fa_icon(:remove), admin_delivery_audience_path(audience), method: :delete, class: 'btn btn-danger'
+    %h4
+      %b
+        = t('activerecord.models.delivery/receiver').pluralize(:ru)
+      = @campaign.receivers.count
diff --git a/config/locales/ru/models.yml b/config/locales/ru/models.yml
@@ -29,6 +29,7 @@ ru:
       delivery/campaign: Кампания
       delivery/audience: Целевая аудитория
       delivery/contact_email: Электронная почта
+      delivery/receiver: Получатель
       tag: Тег
       oauth/app: Приложение
       test_paper: Тест