|
|
|
@ -230,7 +230,7 @@ class BidsController < ApplicationController
|
|
|
|
|
case @bid.reward_type
|
|
|
|
|
when 3
|
|
|
|
|
html_title(l(:label_question_student))
|
|
|
|
|
layout_file = 'base_courses'
|
|
|
|
|
layout_file = 'base_homework'
|
|
|
|
|
when 1
|
|
|
|
|
layout_file = 'base_bids'
|
|
|
|
|
else
|
|
|
|
@ -307,7 +307,7 @@ class BidsController < ApplicationController
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
if @bid.reward_type == 3
|
|
|
|
|
format.html {
|
|
|
|
|
render :layout => 'base_courses'
|
|
|
|
|
render :layout => 'base_homework'
|
|
|
|
|
}
|
|
|
|
|
elsif @bid.reward_type == 1
|
|
|
|
|
format.html {
|
|
|
|
@ -333,7 +333,7 @@ class BidsController < ApplicationController
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
if @bid.reward_type == 3
|
|
|
|
|
format.html {
|
|
|
|
|
render :layout => 'base_courses'
|
|
|
|
|
render :layout => 'base_homework'
|
|
|
|
|
}
|
|
|
|
|
elsif @bid.reward_type == 1
|
|
|
|
|
format.html {
|
|
|
|
@ -361,7 +361,7 @@ class BidsController < ApplicationController
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
if @bid.reward_type == 3
|
|
|
|
|
format.html {
|
|
|
|
|
render :layout => 'base_courses'
|
|
|
|
|
render :layout => 'base_homework'
|
|
|
|
|
}
|
|
|
|
|
elsif @bid.reward_type == 1
|
|
|
|
|
format.html {
|
|
|
|
@ -439,7 +439,7 @@ class BidsController < ApplicationController
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
if @bid.reward_type == 3
|
|
|
|
|
format.html {
|
|
|
|
|
render :layout => 'base_courses'
|
|
|
|
|
render :layout => 'base_homework'
|
|
|
|
|
}
|
|
|
|
|
elsif @bid.reward_type == 1
|
|
|
|
|
format.html {
|
|
|
|
@ -533,7 +533,7 @@ class BidsController < ApplicationController
|
|
|
|
|
if @bid.reward_type == 3
|
|
|
|
|
format.html {
|
|
|
|
|
html_title(l(:label_homework_info))
|
|
|
|
|
render :layout => 'base_courses'
|
|
|
|
|
render :layout => 'base_homework'
|
|
|
|
|
}
|
|
|
|
|
elsif @bid.reward_type == 1
|
|
|
|
|
format.html {
|
|
|
|
@ -565,7 +565,7 @@ class BidsController < ApplicationController
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
if @bid.reward_type == 3
|
|
|
|
|
format.html {
|
|
|
|
|
render :layout => 'base_courses'
|
|
|
|
|
render :layout => 'base_homework'
|
|
|
|
|
}
|
|
|
|
|
elsif @bid.reward_type == 1
|
|
|
|
|
format.html {
|
|
|
|
@ -743,7 +743,7 @@ class BidsController < ApplicationController
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
# added by bai
|
|
|
|
|
# added by bai
|
|
|
|
|
def update_contest
|
|
|
|
|
@bid = Bid.find(params[:id])
|
|
|
|
|
@bid.name = params[:bid][:name]
|
|
|
|
@ -879,7 +879,7 @@ class BidsController < ApplicationController
|
|
|
|
|
#render html to prepare create submit homework
|
|
|
|
|
find_bid
|
|
|
|
|
find_bid
|
|
|
|
|
render :layout => 'base_courses'
|
|
|
|
|
render :layout => 'base_homework'
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def add_homework
|
|
|
|
@ -942,12 +942,12 @@ class BidsController < ApplicationController
|
|
|
|
|
@homework_type = false
|
|
|
|
|
end
|
|
|
|
|
@user = @bid.author
|
|
|
|
|
render :layout => 'base_courses'
|
|
|
|
|
render :layout => 'base_homework'
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def homework_respond
|
|
|
|
|
@user = @bid.author
|
|
|
|
|
render :layout => 'base_courses'
|
|
|
|
|
render :layout => 'base_homework'
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
def more
|
|
|
|
@ -1070,7 +1070,6 @@ class BidsController < ApplicationController
|
|
|
|
|
if params[:id]
|
|
|
|
|
@bid = Bid.find(params[:id], :include => [{:homeworks => :user}])
|
|
|
|
|
@user = @bid.author
|
|
|
|
|
@course = @bid.courses.first
|
|
|
|
|
end
|
|
|
|
|
rescue
|
|
|
|
|
render_404
|
|
|
|
|