Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
yanxd 2013-11-21 14:46:01 +08:00
commit a6d0482804
50 changed files with 50 additions and 50812 deletions

View File

@ -715,6 +715,7 @@ class BidsController < ApplicationController
end
def add_homework
if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ? or id =?',5, 10, 7)).size >0)
# homework = HomeworkAttach.create(:bid_id => @bid.id, :user_id => User.current.id)
# homework.save_attachments(params[:attachments] || (params[:bid] && params[:bid][:uploads]))
@homework = HomeworkAttach.new
@ -722,6 +723,12 @@ class BidsController < ApplicationController
@homework.user_id = User.current.id
@homework.save_attachments(params[:attachments])
@homework.save
if @homework.attachments.empty?
@homework.delete
flash[:error] = l(:no_attachmens_allowed)
# else
end
end
@homework_list = @bid.homeworks
end

View File

@ -100,12 +100,12 @@ class BoardsController < ApplicationController
end
def edit
end
def update
if @project.project_type == 1
render :layout => 'base_courses'
end
end
def update
@board.safe_attributes = params[:board]
if @board.save
redirect_to_settings_in_projects

View File

@ -81,6 +81,35 @@
<% end %>
</td>
</tr>
</table>
</div>
<!--parameter -->
<div class="user_fans">
<table width="240" border="0">
<tr align="center" width="80px">
<td class="font_index"><%=link_to "#{@bid.join_in_contests.count}",:controller => "bids", :action => "show_participator" %></td>
<td class="font_index"><%=link_to "#{@bid.projects.count}", :controller => 'bids', :action => 'show_project' %></td>
<tr class="font_aram">
<td align="center" width="70px"> <%= l(:label_participator) %></td>
<td align="center" width="70px"> <%= l(:label_bidding_project) %></td>
</tr>
</table>
<div class="user_underline"></div>
</div>
<div class="inf_user_image">
<table>
<tr>
<td><%= l(:lable_contest_user) %><%= link_to(@user.show_name, user_path(@user))%></td>
</tr>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1311,6 +1311,8 @@ zh:
button_bidding: 我要参加
field_enterprise: '企业:'
no_attachmens_allowed: 提交作业不能为空
button_bidding_homework: 参加竞标 #huang
field_homework_type: 提交形式 #bai
label_homework_respond: 作业情况
@ -1589,7 +1591,8 @@ zh:
label_join_contest: 加入竞赛
label_exit_contest: 退出竞赛
label_contest_modify_settings: 配置竞赛 #added by bai
label_participator: 参与者
label_contest_modify_settings: 配置竞赛
label_no_current_participate: 该竞赛暂无参与者
#end