cafe-grader-web

Commit r17:af60767c1f7f public

parent | child
Description:
fix layout problem, again git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@41 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r17:af60767c1f7f - - 1 file changed: 1 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,43 +1,43
1 class MainController < ApplicationController
1 class MainController < ApplicationController
2
2
3 before_filter :authenticate, :except => [:index, :login]
3 before_filter :authenticate, :except => [:index, :login]
4
4
5 verify :method => :post, :only => [:submit],
5 verify :method => :post, :only => [:submit],
6 :redirect_to => { :action => :index }
6 :redirect_to => { :action => :index }
7
7
8 - layout 'application'
9
8
10 def index
9 def index
11 redirect_to :action => 'login'
10 redirect_to :action => 'login'
12 end
11 end
13
12
14 def login
13 def login
15 MainController.layout 'login'
14 MainController.layout 'login'
16 reset_session
15 reset_session
17 end
16 end
18
17
19 def list
18 def list
19 + MainController.layout 'application'
20 @problems = Problem.find_available_problems
20 @problems = Problem.find_available_problems
21 @prob_submissions = Array.new
21 @prob_submissions = Array.new
22 @user = User.find(session[:user_id])
22 @user = User.find(session[:user_id])
23 @problems.each do |p|
23 @problems.each do |p|
24 c, sub = Submission.find_by_user_and_problem(@user.id,p.id)
24 c, sub = Submission.find_by_user_and_problem(@user.id,p.id)
25 @prob_submissions << [c,sub]
25 @prob_submissions << [c,sub]
26 end
26 end
27 end
27 end
28
28
29 def submit
29 def submit
30 submission = Submission.new(params[:submission])
30 submission = Submission.new(params[:submission])
31 submission.user_id = session[:user_id]
31 submission.user_id = session[:user_id]
32 submission.language_id = 0
32 submission.language_id = 0
33 source = params['file'].read
33 source = params['file'].read
34 if source.length > 100_000
34 if source.length > 100_000
35 flash[:notice] = 'Error: file too long'
35 flash[:notice] = 'Error: file too long'
36 elsif (lang = Submission.find_language_in_source(source))==nil
36 elsif (lang = Submission.find_language_in_source(source))==nil
37 flash[:notice] = 'Error: cannot determine language used'
37 flash[:notice] = 'Error: cannot determine language used'
38 elsif ((submission.problem_id==-1) and
38 elsif ((submission.problem_id==-1) and
39 !(problem=Submission.find_problem_in_source(source)))
39 !(problem=Submission.find_problem_in_source(source)))
40 flash[:notice] = 'Error: cannot determine problem submitted'
40 flash[:notice] = 'Error: cannot determine problem submitted'
41 elsif ((submission.problem_id==-1) and
41 elsif ((submission.problem_id==-1) and
42 (problem.available == false))
42 (problem.available == false))
43 flash[:notice] = 'Error: problem is not available'
43 flash[:notice] = 'Error: problem is not available'
You need to be logged in to leave comments. Login now