From cbe22e4e60fedbff1b52a208ba44e98dfe1cda62 Mon Sep 17 00:00:00 2001 From: xianbo Date: Sat, 26 Oct 2013 15:04:00 +0800 Subject: [PATCH] modify the judge of the nil class of identity in app/views/bids/_project_list.html.erb --- app/views/bids/_project_list.html.erb | 14 +++++++------- app/views/bids/set_reward.js.erb | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/bids/_project_list.html.erb b/app/views/bids/_project_list.html.erb index 25f0ef452..3bd71a659 100644 --- a/app/views/bids/_project_list.html.erb +++ b/app/views/bids/_project_list.html.erb @@ -1,13 +1,13 @@ <%= render_flash_messages %> <% if @bid.reward_type == 3 %> - <% unless User.current.nil?%> - <% if User.current.user_extensions.identity == 1 %> -
-

<%= l(:label_homework_prompt) %>

-

<%= l(:label_homework_prompt_content) %>

-
- <% end %> + <% if User.current.logged?%> + <% if User.current.user_extensions.identity == 1 %> +
+

<%= l(:label_homework_prompt) %>

+

<%= l(:label_homework_prompt_content) %>

+
+ <% end %> <% end %> diff --git a/app/views/bids/set_reward.js.erb b/app/views/bids/set_reward.js.erb index f3f20aa55..b146f7666 100644 --- a/app/views/bids/set_reward.js.erb +++ b/app/views/bids/set_reward.js.erb @@ -18,7 +18,7 @@ else when 2 case get_prize(@b_p) when '-1' - image_tag("/images/bid/s_reward.png") + image_tag("/images/bid/special_reward.png") when '1' when '0' image_tag("/images/bid/first_reward.png")
<%= l(:label_homework_project) %>(<%= bidding_project.count%>)