Description:
fixed error when submitted file is nil
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@366 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
r169:6eb47384a88d - - 1 file changed: 1 inserted, 1 deleted
@@ -44,25 +44,25 | |||||
|
44 | end |
|
44 | end |
|
45 |
|
45 | ||
|
46 | def help |
|
46 | def help |
|
47 | @user = User.find(session[:user_id]) |
|
47 | @user = User.find(session[:user_id]) |
|
48 | end |
|
48 | end |
|
49 |
|
49 | ||
|
50 | def submit |
|
50 | def submit |
|
51 | user = User.find(session[:user_id]) |
|
51 | user = User.find(session[:user_id]) |
|
52 |
|
52 | ||
|
53 | @submission = Submission.new(params[:submission]) |
|
53 | @submission = Submission.new(params[:submission]) |
|
54 | @submission.user = user |
|
54 | @submission.user = user |
|
55 | @submission.language_id = 0 |
|
55 | @submission.language_id = 0 |
|
56 | - if params['file']!='' |
|
56 | + if (params['file']) and (params['file']!='') |
|
57 | @submission.source = params['file'].read |
|
57 | @submission.source = params['file'].read |
|
58 | @submission.source_filename = params['file'].original_filename |
|
58 | @submission.source_filename = params['file'].original_filename |
|
59 | end |
|
59 | end |
|
60 | @submission.submitted_at = Time.new.gmtime |
|
60 | @submission.submitted_at = Time.new.gmtime |
|
61 |
|
61 | ||
|
62 | if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and |
|
62 | if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and |
|
63 | user.site!=nil and user.site.finished? |
|
63 | user.site!=nil and user.site.finished? |
|
64 | @submission.errors.add_to_base "The contest is over." |
|
64 | @submission.errors.add_to_base "The contest is over." |
|
65 | prepare_list_information |
|
65 | prepare_list_information |
|
66 | render :action => 'list' and return |
|
66 | render :action => 'list' and return |
|
67 | end |
|
67 | end |
|
68 |
|
68 |
You need to be logged in to leave comments.
Login now