cafe-grader-web

Commit r26:a3328dc4a80b public

parent | child
Description:
fixed layout bugs again -- added explicit layout in main_controller git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@50 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

r26:a3328dc4a80b - - 1 file changed: 2 inserted, 0 deleted

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