jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modify the admin select

This commit is contained in:
xianbo 2013-10-10 10:22:32 +08:00
parent 677bc4060b
commit b0d413a216
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/bids_controller.rb
View File

@ -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)

4
app/views/projects/_project.html.erb
View File

@ -77,7 +77,9 @@
<% end %>
<% if(@project.project_type==1)%>
&nbsp;&nbsp;&nbsp;大学：
<%= @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 %>
</div>
<div class="licences">