Merge branch 'release/0.14.7.13'

ulmic · Mar 3, 2017 · 26dd2ef · 26dd2ef
2 parents 2f14e6d + 2897808
commit 26dd2ef
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 66 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -17,6 +17,7 @@ class User < ActiveRecord::Base
   has_many :comments, dependent: :destroy
   has_and_belongs_to_many :teams
   has_many :merits, class_name: 'ActivityLines::Corporative::Merit'
+  has_many :ya_lider_participations, class_name: 'ActivityLines::Lider::YaLider::Participation'
 
   validates :email, email: true,
                     allow_blank: true

diff --git a/app/views/web/admin/activity_lines/lider/ya_lider/stages/show.html.haml b/app/views/web/admin/activity_lines/lider/ya_lider/stages/show.html.haml
@@ -9,7 +9,7 @@
     = link_to t('helpers.links.back'), admin_activity_lines_lider_ya_lider_path(@stage.contest), class: 'btn btn-default'
   = 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
+  = render 'web/admin/activity_lines/lider/ya_lider/participants/list', activity_lines_lider_ya_lider_participants: @current_participants, for_partial: :stage_show
 .row
   - if @stage.is_the_first?
     = link_to t('helpers.links.add'), new_admin_activity_lines_lider_ya_lider_participant_path(activity_lines_lider_ya_lider_particpant: { contest_id: @stage.contest_id }), class: 'btn btn-success'

diff --git a/bin/data_fixes/user_to_member_fix.rb b/bin/data_fixes/user_to_member_fix.rb
@@ -2,7 +2,7 @@
   user = User.find ENV['USER_ID']
   member = Member.find ENV['MEMBER_ID']
   puts "Updating associations...".green
-  [:authentications, :article, :registrations, :logged_actions, :comments].each do |association|
+  [:authentications, :article, :registrations, :logged_actions, :comments, :ya_lider_participations].each do |association|
     user.send(association).each do |obj|
       obj.update_attributes! user_id: member.id
     end

diff --git a/config/locales/ru/ru.yml b/config/locales/ru/ru.yml
@@ -159,6 +159,10 @@ ru:
             form:
               ask_your_question: Задайте свой вопрос
               anonym: Анонимно?
+      lider:
+        ya_liders:
+          show:
+            participants: Участники конкурса
     sessions:
       new:
         title: Авторизация

diff --git a/test/controllers/web/admin/oauth/apps_controller_test.rb b/test/controllers/web/admin/oauth/apps_controller_test.rb