modify the admin select
This commit is contained in:
parent
677bc4060b
commit
b0d413a216
|
@ -211,8 +211,11 @@ class BidsController < ApplicationController
|
|||
@membership = User.current.memberships.all(:conditions => Project.visible_condition(User.current))
|
||||
@option = []
|
||||
@membership.each do |membership|
|
||||
if(membership.project.project_type==1)
|
||||
else
|
||||
@option << membership.project
|
||||
end
|
||||
end
|
||||
# a = [1]
|
||||
# @project = Project.where("id in []", a)
|
||||
@user = @bid.author
|
||||
|
@ -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)
|
||||
|
|
|
@ -77,8 +77,10 @@
|
|||
<% end %>
|
||||
<% if(@project.project_type==1)%>
|
||||
大学:
|
||||
<%if @admin&&@admin.first&&@admin.first.user&&@admin.first.user.user_extensions%>
|
||||
<%= @admin.first.user.user_extensions.occupation %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="licences">
|
||||
<%= content_tag('span', "#{l(:label_create_time)}: ") %><%= content_tag('span', format_time(@project.created_on)) %>
|
||||
|
|
Loading…
Reference in New Issue