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

修改加入竞赛和退出竞赛不能刷新的问题；新建项目后不能刷新的问题；竞赛列表和竞赛页面搜索问题

This commit is contained in:
wanglinchun 2014-04-03 22:15:19 +08:00
parent 120e84cfc7
commit 1e7e0a1bb5
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/bids_controller.rb
View File

@ -461,22 +461,22 @@ class BidsController < ApplicationController
# added by bai type ==1 需求，type==2 竞赛， type==3 作业 # added by bai type ==1 需求，type==2 竞赛， type==3 作业
if @bid.reward_type == 1 if @bid.reward_type == 1
flash[:notice] = l(:label_bidding_succeed) flash.now[:notice] = l(:label_bidding_succeed)
elsif @bid.reward_type == 2 elsif @bid.reward_type == 2
flash[:notice] = l(:label_bidding_contest_succeed) flash.now[:notice] = l(:label_bidding_contest_succeed)
else @bid.reward_type == 3 else @bid.reward_type == 3
flash[:notice] = l(:label_bidding_homework_succeed) flash.now[:notice] = l(:label_bidding_homework_succeed)
end end
# end # end
end end
else else
if @bid.reward_type == 3 if @bid.reward_type == 3
flash[:error] = l(:label_bidding_homework_fail) flash.now[:error] = l(:label_bidding_homework_fail)
else else
flash[:error] = l(:label_bidding_fail) flash.now[:error] = l(:label_bidding_fail)
end end
end end
@bidding_project = @bid.biding_projects @bidding_project = @bid.biding_projects

4
app/controllers/welcome_controller.rb
View File

@ -81,7 +81,7 @@ class WelcomeController < ApplicationController
end end
def contest def contest
end end
def search def search
@ -120,7 +120,7 @@ class WelcomeController < ApplicationController
def entry_select_contest def entry_select_contest
if request.original_url.match(/contest\.trustie\.net/) if request.original_url.match(/contest\.trustie\.net/)
contest contest
render :contest render :contest
return 0 return 0
end end
end end

8
app/views/welcome/contest.html.erb
View File

@ -100,13 +100,15 @@
<div class="welcome_left" > <div class="welcome_left" >
<span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_contest) %></span> <span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_contest_description) %></span> <span class="font_welcome_trustie"><%= l(:label_welcome_trustie) %><%= l(:label_welcome_trustie_contest) %></span> <span class="font_welcome_tdescription">, <%= l(:label_welcome_trustie_contest_description) %></span>
</div> </div>
<div class="search-bar"> <div style="width: 45%; height: 40px; border: 1px solid black; float:right;">
<%= render :partial => "search_project", :locals => {:project_type => 0}%>
</div> </div>
<div style="clear: both;"></div> <div style="clear: both;"></div>
</div> </div>
</div> </div>
<div class="search-bar">
<%= render :partial => "search_project", :locals => {:project_type => 0}%>
</div>
<div style="clear:both"></div> <div style="clear:both"></div>
<div id="J_Slide" class="d-p-index-box d-p-index-hotproject"> <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">

3
config/locales/zh.yml
View File

@ -1824,3 +1824,6 @@ zh:
label_participate: 参赛者 label_participate: 参赛者
label_contest_project: 参赛项目 label_contest_project: 参赛项目
label_contest_application: 参赛应用 label_contest_application: 参赛应用
button_contesting_as_project: 我要参赛（新建项目）
button_contesting_as_application: 我要参赛（发布应用）

2
config/routes.rb
View File

@ -560,7 +560,7 @@ RedmineApp::Application.routes.draw do
match 'calls', :controller => 'bids', :action => 'index' match 'calls', :controller => 'bids', :action => 'index'
match 'calls/:id', :controller => 'bids', :action => 'show', :as => 'respond' match 'calls/:id', :controller => 'bids', :action => 'show', :as => 'respond'
match 'contest', :controller => 'bids', :action => 'contest', :as => 'contest' match 'contest', :controller => 'bids', :action => 'contests', :as => 'contest' #modified @20140403
######added by nie ######added by nie
match 'tags/show_projects_tags',:to => 'tags#show_projects_tags' match 'tags/show_projects_tags',:to => 'tags#show_projects_tags'