Description:
remove lingering debug info
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r786:4e030454953c - - 3 files changed: 0 inserted, 6 deleted
| @@ -133,36 +133,35 | |||
|
|
133 | 133 | flash[:notice] = 'You are not authorized to view the page you requested' |
|
|
134 | 134 | #request.env['HTTP_REFERER'] ? (redirect_to :back) : (redirect_to :controller => 'login') |
|
|
135 | 135 | redirect_to :controller => 'main', :action => 'login' |
|
|
136 | 136 | return false |
|
|
137 | 137 | end |
|
|
138 | 138 | end |
|
|
139 | 139 | |
|
|
140 | 140 | def verify_time_limit |
|
|
141 | 141 | return true if session[:user_id]==nil |
|
|
142 | 142 | user = User.find(session[:user_id], :include => :site) |
|
|
143 | 143 | return true if user==nil || user.site == nil |
|
|
144 | 144 | if user.contest_finished? |
|
|
145 | 145 | flash[:notice] = 'Error: the contest you are participating is over.' |
|
|
146 | 146 | redirect_to :back |
|
|
147 | 147 | return false |
|
|
148 | 148 | end |
|
|
149 | 149 | return true |
|
|
150 | 150 | end |
|
|
151 | 151 | |
|
|
152 | 152 | def is_request_ip_allowed? |
|
|
153 | 153 | unless GraderConfiguration[WHITELIST_IGNORE_CONF_KEY] |
|
|
154 | 154 | user_ip = IPAddr.new(request.remote_ip) |
|
|
155 | 155 | |
|
|
156 | 156 | GraderConfiguration[WHITELIST_IP_CONF_KEY].delete(' ').split(',').each do |ips| |
|
|
157 | - puts "ip is #{ips}, user ip is #{user_ip}" | |
|
|
158 | 157 | allow_ips = IPAddr.new(ips) |
|
|
159 | 158 | if allow_ips.include?(user_ip) |
|
|
160 | 159 | return true |
|
|
161 | 160 | end |
|
|
162 | 161 | end |
|
|
163 | 162 | return false |
|
|
164 | 163 | end |
|
|
165 | 164 | return true |
|
|
166 | 165 | end |
|
|
167 | 166 | |
|
|
168 | 167 | end |
| @@ -54,51 +54,48 | |||
|
|
54 | 54 | unless @current_user.can_view_problem?(@problem) |
|
|
55 | 55 | unauthorized_redirect |
|
|
56 | 56 | return |
|
|
57 | 57 | end |
|
|
58 | 58 | @source = '' |
|
|
59 | 59 | if (params[:view_latest]) |
|
|
60 | 60 | sub = Submission.find_last_by_user_and_problem(@current_user.id,@problem.id) |
|
|
61 | 61 | @source = @submission.source.to_s if @submission and @submission.source |
|
|
62 | 62 | end |
|
|
63 | 63 | render 'edit' |
|
|
64 | 64 | end |
|
|
65 | 65 | |
|
|
66 | 66 | # GET /submissions/1/edit |
|
|
67 | 67 | def edit |
|
|
68 | 68 | @submission = Submission.find(params[:id]) |
|
|
69 | 69 | @source = @submission.source.to_s |
|
|
70 | 70 | @problem = @submission.problem |
|
|
71 | 71 | @lang_id = @submission.language.id |
|
|
72 | 72 | end |
|
|
73 | 73 | |
|
|
74 | 74 | |
|
|
75 | 75 | def get_latest_submission_status |
|
|
76 | 76 | @problem = Problem.find(params[:pid]) |
|
|
77 | 77 | @submission = Submission.find_last_by_user_and_problem(params[:uid],params[:pid]) |
|
|
78 | - puts User.find(params[:uid]).login | |
|
|
79 | - puts Problem.find(params[:pid]).name | |
|
|
80 | - puts 'nil' unless @submission | |
|
|
81 | 78 | respond_to do |format| |
|
|
82 | 79 | format.js |
|
|
83 | 80 | end |
|
|
84 | 81 | end |
|
|
85 | 82 | |
|
|
86 | 83 | # GET /submissions/:id/rejudge |
|
|
87 | 84 | def rejudge |
|
|
88 | 85 | @submission = Submission.find(params[:id]) |
|
|
89 | 86 | @task = @submission.task |
|
|
90 | 87 | @task.status_inqueue! if @task |
|
|
91 | 88 | respond_to do |format| |
|
|
92 | 89 | format.js |
|
|
93 | 90 | end |
|
|
94 | 91 | end |
|
|
95 | 92 | |
|
|
96 | 93 | protected |
|
|
97 | 94 | |
|
|
98 | 95 | def submission_authorization |
|
|
99 | 96 | #admin always has privileged |
|
|
100 | 97 | if @current_user.admin? |
|
|
101 | 98 | return true |
|
|
102 | 99 | end |
|
|
103 | 100 | |
|
|
104 | 101 | sub = Submission.find(params[:id]) |
| @@ -1,43 +1,41 | |||
|
|
1 | 1 | %table.table.sortable.table-striped.table-bordered.table-condensed |
|
|
2 | 2 | %thead |
|
|
3 | 3 | %tr |
|
|
4 | 4 | %th Login |
|
|
5 | 5 | %th Name |
|
|
6 | 6 | / %th Activated? |
|
|
7 | 7 | / %th Logged_in |
|
|
8 | 8 | / %th Contest(s) |
|
|
9 | 9 | %th Remark |
|
|
10 | 10 | - @problems.each do |p| |
|
|
11 | 11 | %th.text-right= p.name.gsub('_',' ') |
|
|
12 | 12 | %th.text-right Total |
|
|
13 | 13 | %th.text-right Passed |
|
|
14 | 14 | %tbody |
|
|
15 | 15 | - sum = Array.new(@problems.count+1,0) |
|
|
16 | 16 | - nonzero = Array.new(@problems.count+1,0) |
|
|
17 | 17 | - full = Array.new(@problems.count+1,0) |
|
|
18 | - - puts @scorearray | |
|
|
19 | - - puts @problems.count | |
|
|
20 | 18 | - @scorearray.each do |sc| |
|
|
21 | 19 | %tr |
|
|
22 | 20 | - total,num_passed = 0,0 |
|
|
23 | 21 | - sc.each_index do |i| |
|
|
24 | 22 | - if i == 0 |
|
|
25 | 23 | %td= link_to sc[i].login, stat_user_path(sc[i]) |
|
|
26 | 24 | %td= sc[i].full_name |
|
|
27 | 25 | / %td= sc[i].activated |
|
|
28 | 26 | / %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no' |
|
|
29 | 27 | / %td= sc[i].contests.collect {|c| c.name}.join(', ') |
|
|
30 | 28 | %td= sc[i].remark |
|
|
31 | 29 | - else |
|
|
32 | 30 | %td.text-right= sc[i][0] |
|
|
33 | 31 | - total += sc[i][0] |
|
|
34 | 32 | - num_passed += 1 if sc[i][1] |
|
|
35 | 33 | - sum[i] += sc[i][0] |
|
|
36 | 34 | - nonzero[i] += 1 if sc[i][0] > 0 |
|
|
37 | 35 | - full[i] += 1 if sc[i][1] |
|
|
38 | 36 | %td.text-right= total |
|
|
39 | 37 | %td.text-right= num_passed |
|
|
40 | 38 | %tfoot |
|
|
41 | 39 | %tr |
|
|
42 | 40 | %td Summation |
|
|
43 | 41 | %td |
You need to be logged in to leave comments.
Login now