Merge branch 'release/0.16'

ulmic · Mar 26, 2017 · 834f4b4 · 834f4b4
2 parents 2fa4a1f + ab2cf63
commit 834f4b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/app/views/web/activity_lines/lider/ya_liders/show.html.haml b/app/views/web/activity_lines/lider/ya_liders/show.html.haml
@@ -20,7 +20,11 @@
 %hr
 .row
   .auth_button_row
-    = link_to t('.participants'), '#', class: 'btn btn-branded'
+    - if signed_in?
+      - if @contest.current_stage.participants.map(&:user_id).include?(current_user.id)
+        = link_to t('.add_event'), '#', class: 'btn btn-branded'
+    - else
+      = link_to t('.i_am_participant'), new_session_path(url: activity_lines_lider_ya_lider_path(@contest.contest_number)), class: 'btn btn-branded'
 .row.for_news
 .row.plaha
   .col-md-6.text.left

diff --git a/config/locales/ru/ru.yml b/config/locales/ru/ru.yml
@@ -163,6 +163,8 @@ ru:
         ya_liders:
           show:
             participants: Участники конкурса
+            i_am_participant: Я участник конкурса
+            add_event: Анонсировать мероприятие
     sessions:
       new:
         title: Авторизация

diff --git a/lib/concerns/duration_managment.rb b/lib/concerns/duration_managment.rb
@@ -19,6 +19,6 @@ def begin_before_end_date
     end
   end
   def during?
-    begin_date < DateTime.now && end_date > DateTime.now
+    begin_date < DateTime.current && end_date > DateTime.current
   end
 end