Merge branch 'release/0.14.2.1'

ulmic · Jan 29, 2017 · 9281c9a · 9281c9a
2 parents 936e952 + 139f9f4
commit 9281c9a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/app/models/member.rb b/app/models/member.rb
@@ -131,6 +131,10 @@ def has_permission_to?(action, type)
     Organization::Permissions.send(type)[action].map(&:id).include? self.id
   end
 
+  def is_honorable?
+    merits.where(nomination: :first_degree).any?
+  end
+
   private
 
   def remove_empty_positions

diff --git a/app/views/web/members/shared/_mic_userpic_circle.html.haml b/app/views/web/members/shared/_mic_userpic_circle.html.haml
@@ -1,11 +1,13 @@
 - if member.confirmed?
   .mic-userpic-circle.link{ data: { href: member_path(member.ticket) }, style: "background-image: url(#{member.avatar})" }
-    .silver_icon
-      = image_tag 'organization/silver_icon.png'
+    - if member.is_honorable?
+      .silver_icon
+        = image_tag 'organization/silver_icon.png'
 - else
   .mic-userpic-circle{ style: "background-image: url(#{member.element_avatar})" }
-    .silver_icon
-      = image_tag 'organization/silver_icon.png'
+    - if member.is_honorable?
+      .silver_icon
+        = image_tag 'organization/silver_icon.png'
 .name
   - if member.confirmed?
     %a.text{ href: member_path(member.ticket) }

diff --git a/test/controllers/web/welcome_controller_test.rb b/test/controllers/web/welcome_controller_test.rb
@@ -13,4 +13,11 @@ class Web::WelcomeControllerTest < ActionController::TestCase
     get :index
     assert_response :success, @response.body
   end
+
+  test 'should get index 100 times' do
+    100.times do
+      get :index
+      assert_response :success, @response.body
+    end
+  end
 end