Merge branch 'release/1.0.6.1'

ulmic · Jun 12, 2017 · e6f77cf · e6f77cf
2 parents b92cb9e + 0464316
commit e6f77cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/app/controllers/web/admin/welcome_controller.rb b/app/controllers/web/admin/welcome_controller.rb
@@ -30,7 +30,8 @@ def index
         most_viewed_news: "#{most_viewed_news_count.title} (#{most_viewed_news_count.page_views.count})",
         most_viewed_event: "#{most_viewed_event_count.title} (#{most_viewed_event_count.page_views.count})",
         member: "#{member.decorate.short_name} (#{member_id[1].count})",
-        contact_emails_count: Delivery::ContactEmail.presented.count
+        contact_emails_count: Delivery::ContactEmail.presented.count,
+        clicks_count: Click.count
       }
     end
   end

diff --git a/config/locales/ru/admin.yml b/config/locales/ru/admin.yml
@@ -41,6 +41,7 @@ ru:
           most_viewed_event: Самое просматриваемое мероприятие
           member: Самый просматриваемый профиль члена МИЦ
           contact_emails_count: Количество электронных почт для рассылки
+          clicks_count: Количество кликов
       mines:
         show:
           title: Мои записи