Merge branch 'release/0.17.9'

ulmic · Apr 23, 2017 · 1d9ffe5 · 1d9ffe5
2 parents 25e4d07 + faecbad
commit 1d9ffe5
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 0 deletions.
diff --git a/...views/web/admin/activity_lines/lider/ya_lider/participants/shared/_stage_3_info.html.haml b/...views/web/admin/activity_lines/lider/ya_lider/participants/shared/_stage_3_info.html.haml
@@ -0,0 +1,23 @@
+%h3
+  = link_to @stage.full_title, admin_activity_lines_lider_ya_lider_stage_path(@stage)
+  |
+  Конкурсное мероприятие
+%br
+.row
+  .col-md-12
+    %table.table.table-striped.table-condensed
+      - if participant.event.present?
+        %h2
+          = participant.event.event.title
+          = link_to fa_icon(:share), event_path(participant.event.event), class: 'btn btn-success'
+        - participant.event.fields.each do |field|
+          %tr
+            %td
+              = t("enumerize.activity_lines/lider/ya_lider/event_field.title.#{field.title}")
+            %td
+              = field.value
+      - else
+        .panel.panel-warning
+          .panel-heading
+            %h4
+              = t('.participant_have_not_anounce_any_event')
diff --git a/app/views/web/admin/activity_lines/lider/ya_lider/participants/show.html.haml b/app/views/web/admin/activity_lines/lider/ya_lider/participants/show.html.haml
@@ -32,6 +32,11 @@
             - else
               Не синхронизировалось Эссе! Обратитесь к администратору сайта
               = link_to fa_icon(:exclamation), new_admin_activity_lines_lider_ya_lider_participant_field_path(activity_lines_lider_ya_lider_participant_field: { field_type: :file, title: :esse, participant_id: @participant.id }), class: 'btn btn-danger'
+        %tr
+          %td
+            = t('activerecord.models.activity_lines/lider/ya_lider/participant_event')
+          %td
+            = link_to @participant.event.event.title, event_path(@participant.event.event)
   %hr
   .tabs
     %ul.nav.nav-tabs{ role: :tablist }

diff --git a/app/views/web/admin/activity_lines/lider/ya_liders/show.html.haml b/app/views/web/admin/activity_lines/lider/ya_liders/show.html.haml
@@ -17,6 +17,7 @@
       - if @current_participants.present?
         .row
           .col-md-6
+            = link_to t('.add_participant'), new_admin_activity_lines_lider_ya_lider_participant_path(activity_lines_lider_ya_lider_particpant: { contest_id: @ya_lider.id })
           = render 'web/admin/default/search', model_class: ActivityLines::Lider::YaLider::Participant
         .row
           = render 'web/admin/activity_lines/lider/ya_lider/participants/list', activity_lines_lider_ya_lider_participants: @current_participants

diff --git a/config/locales/ru/admin.yml b/config/locales/ru/admin.yml
@@ -84,6 +84,9 @@ ru:
             participants:
               form:
                 create_user: Создать пользователя
+              shared:
+                stage_3_info:
+                  participant_have_not_anounce_any_event: Участник не анонсировал мероприятия
           ya_liders:
             show:
               this_people_have_access_to_ya_lider: Эти люди имеют доступ в админку сайта МИЦ. Смогут создавать мероприятия, новости, а также видеть и редактировать информацию о конкурсе и участниках

diff --git a/config/locales/ru/models.yml b/config/locales/ru/models.yml
@@ -23,6 +23,7 @@ ru:
       activity_lines/lider/ya_lider: Конкурс "Я-лидер!"
       activity_lines/lider/ya_lider/stage: Этап конкурса "Я-лидер!"
       activity_lines/lider/ya_lider/participant: Участник конкурса "Я-лидер!"
+      activity_lines/lider/ya_lider/participant_event: Мероприятие участника
       logged_action: Лог действия
       redirect_rule: Редирект
       image: Изображение