From b0d413a2169c574a65b7c4a8f3dcd5a344eb895c Mon Sep 17 00:00:00 2001 From: xianbo Date: Thu, 10 Oct 2013 10:22:32 +0800 Subject: [PATCH] modify the admin select --- app/controllers/bids_controller.rb | 6 ++++-- app/views/projects/_project.html.erb | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb index 810322931..d575703aa 100644 --- a/app/controllers/bids_controller.rb +++ b/app/controllers/bids_controller.rb @@ -211,7 +211,10 @@ class BidsController < ApplicationController @membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current)) @option = [] @membership.each do |membership| - @option << membership.project + if(membership.project.project_type==1) + else + @option << membership.project + end end # a = [1] # @project = Project.where("id in []", a) @@ -242,7 +245,6 @@ class BidsController < ApplicationController @membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current)) @option = [] @membership.each do |membership| - @option << membership.project end # a = [1] # @project = Project.where("id in []", a) diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb index d5ced06d4..0e27ace8f 100644 --- a/app/views/projects/_project.html.erb +++ b/app/views/projects/_project.html.erb @@ -77,7 +77,9 @@ <% end %> <% if(@project.project_type==1)%>    大学： - <%= @admin.first.user.user_extensions.occupation %> + <%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%> + <%= @admin.first.user.user_extensions.occupation %> + <% end %> <% end %>