Merge branch 'release/0.14.5.1'

ulmic · Feb 26, 2017 · 3f2fce4 · 3f2fce4
2 parents 045dc61 + 7b3e7ab
commit 3f2fce4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/app/controllers/web/admin/teams_controller.rb b/app/controllers/web/admin/teams_controller.rb
@@ -6,7 +6,7 @@ class Web::Admin::TeamsController < Web::Admin::ApplicationController
 
   before_filter :choose_members, only: [ :new, :edit ]
   before_filter :choose_departaments, only: [ :new, :edit ]
-  before_filter :choose_teammates, only: [ :new, :edit ]
+  before_filter :choose_users, only: [ :new, :edit ]
   before_filter :choose_projects, only: [ :new, :edit ]
 
   def index
@@ -31,7 +31,7 @@ def create
     else
       choose_members
       choose_departaments
-      choose_teammates
+      choose_users
       choose_projects
       @categories = Category.presented.decorate
       render action: :new
@@ -51,7 +51,7 @@ def update
     else
       choose_members
       choose_departaments
-      choose_teammates
+      choose_users
       choose_projects
       render action: :edit
     end

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
@@ -47,7 +47,7 @@
             - @ya_lider.committee.members.decorate.each do |member|
               %tr
                 %td
-                  = image_tag member.small_avatar_url
+                  %img{ src: member.small_avatar_url, width: '100px' }
                 %td
                   = link_to member.short_name
       %hr

diff --git a/app/views/web/admin/teams/_form.html.haml b/app/views/web/admin/teams/_form.html.haml
@@ -27,6 +27,6 @@
       = f.input :state_event, as: :state_event
       = f.input :publicity
       = f.input :member_id, as: :select, collection: members_hash(@members), input_html: { class: :select2 }
-      = f.association :users, label_method: lambda { |member| "#{member.ticket} | #{member.first_name} #{member.last_name}" }, input_html: { class: :select2 }, collection: @teammates
+      = f.association :users, label_method: lambda { |member| "#{member.ticket} | #{member.first_name} #{member.last_name}" }, input_html: { class: :select2 }, collection: @users
       = f.button :submit, class: 'btn-success', value: t('helpers.links.save')
       = link_to t('helpers.links.back'), admin_teams_path, class: 'btn btn-default'