diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index cb6d770fb..aa160acfd 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -554,11 +554,13 @@ class RepositoriesController < ApplicationController graph.burn end def check_hidden_repo - project = Project.find_by_id(params[:id]) + project = Project.find(params[:id]) if !User.current.member_of?(project) if project.hidden_repo render_403 end end + rescue ActiveRecord::RecordNotFound + render_404 end end diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index 082286e27..2f627fa1d 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -31,11 +31,19 @@
<%=link_to journal.user, user_path(journal.user)%> <%= l(:label_question_requirement) %> | - <% else %> -<%=link_to journal.user, user_path(journal.user)%> <%= l(:label_respond_requirement) %> | - <% end %> + <% label = ''; + case @bid.reward_type + when 1 + label = l(:label_respond_requirement) + when 2 + label = l(:label_contest_requirement) + when 3 + label = l(:label_question_requirement) + else + + end + %> +<%=link_to journal.user, user_path(journal.user)%> <%= label %> | |||