Description:
fix allow admin to submit to any problem
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r682:405106fcdb33 - - 7 files changed: 18 inserted, 6 deleted
| @@ -77,25 +77,25 | |||
|
|
77 | 77 | @submission.language = language |
|
|
78 | 78 | end |
|
|
79 | 79 | |
|
|
80 | 80 | @submission.submitted_at = Time.new.gmtime |
|
|
81 | 81 | @submission.ip_address = request.remote_ip |
|
|
82 | 82 | |
|
|
83 | 83 | if GraderConfiguration.time_limit_mode? and user.contest_finished? |
|
|
84 | 84 | @submission.errors.add(:base,"The contest is over.") |
|
|
85 | 85 | prepare_list_information |
|
|
86 | 86 | render :action => 'list' and return |
|
|
87 | 87 | end |
|
|
88 | 88 | |
|
|
89 | - if @submission.valid? | |
|
|
89 | + if @submission.valid?(@current_user) | |
|
|
90 | 90 | if @submission.save == false |
|
|
91 | 91 | flash[:notice] = 'Error saving your submission' |
|
|
92 | 92 | elsif Task.create(:submission_id => @submission.id, |
|
|
93 | 93 | :status => Task::STATUS_INQUEUE) == false |
|
|
94 | 94 | flash[:notice] = 'Error adding your submission to task queue' |
|
|
95 | 95 | end |
|
|
96 | 96 | else |
|
|
97 | 97 | prepare_list_information |
|
|
98 | 98 | render :action => 'list' and return |
|
|
99 | 99 | end |
|
|
100 | 100 | redirect_to :action => 'list' |
|
|
101 | 101 | end |
| @@ -43,24 +43,29 | |||
|
|
43 | 43 | |
|
|
44 | 44 | def compiler_msg |
|
|
45 | 45 | @submission = Submission.find(params[:id]) |
|
|
46 | 46 | respond_to do |format| |
|
|
47 | 47 | format.js |
|
|
48 | 48 | end |
|
|
49 | 49 | end |
|
|
50 | 50 | |
|
|
51 | 51 | #on-site new submission on specific problem |
|
|
52 | 52 | def direct_edit_problem |
|
|
53 | 53 | @problem = Problem.find(params[:problem_id]) |
|
|
54 | 54 | @source = '' |
|
|
55 | + if (params[:user_id]) | |
|
|
56 | + u = User.find(params[:user_id]) | |
|
|
57 | + @submission = Submission.find_last_by_user_and_problem(u.id,@problem.id) | |
|
|
58 | + @source = @submission.source.to_s if @submission and @submission.source | |
|
|
59 | + end | |
|
|
55 | 60 | render 'edit' |
|
|
56 | 61 | end |
|
|
57 | 62 | |
|
|
58 | 63 | # GET /submissions/1/edit |
|
|
59 | 64 | def edit |
|
|
60 | 65 | @submission = Submission.find(params[:id]) |
|
|
61 | 66 | @source = @submission.source.to_s |
|
|
62 | 67 | @problem = @submission.problem |
|
|
63 | 68 | @lang_id = @submission.language.id |
|
|
64 | 69 | end |
|
|
65 | 70 | |
|
|
66 | 71 | |
| @@ -128,35 +128,39 | |||
|
|
128 | 128 | |
|
|
129 | 129 | def assign_language |
|
|
130 | 130 | self.language = Submission.find_language_in_source(self.source, |
|
|
131 | 131 | self.source_filename) |
|
|
132 | 132 | end |
|
|
133 | 133 | |
|
|
134 | 134 | # validation codes |
|
|
135 | 135 | def must_specify_language |
|
|
136 | 136 | return if self.source==nil |
|
|
137 | 137 | |
|
|
138 | 138 | # for output_only tasks |
|
|
139 | 139 | return if self.problem!=nil and self.problem.output_only |
|
|
140 | - | |
|
|
140 | + | |
|
|
141 | 141 | if self.language==nil |
|
|
142 | 142 | errors.add('source',"Cannot detect language. Did you submit a correct source file?") unless self.language!=nil |
|
|
143 | 143 | end |
|
|
144 | 144 | end |
|
|
145 | 145 | |
|
|
146 | 146 | def must_have_valid_problem |
|
|
147 | 147 | return if self.source==nil |
|
|
148 | 148 | if self.problem==nil |
|
|
149 | 149 | errors.add('problem',"must be specified.") |
|
|
150 | - elsif (!self.problem.available) and (self.new_record?) | |
|
|
151 | - errors.add('problem',"must be valid.") | |
|
|
150 | + else | |
|
|
151 | + #admin always have right | |
|
|
152 | + return if self.user.admin? | |
|
|
153 | + | |
|
|
154 | + #check if user has the right to submit the problem | |
|
|
155 | + errors.add('problem',"must be valid.") if (!self.user.available_problem.include?(self.problem)) and (self.new_record?) | |
|
|
152 | 156 | end |
|
|
153 | 157 | end |
|
|
154 | 158 | |
|
|
155 | 159 | # callbacks |
|
|
156 | 160 | def assign_latest_number_if_new_recond |
|
|
157 | 161 | return if !self.new_record? |
|
|
158 | 162 | latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id) |
|
|
159 | 163 | self.number = (latest==nil) ? 1 : latest.number + 1; |
|
|
160 | 164 | end |
|
|
161 | 165 | |
|
|
162 | 166 | end |
| @@ -283,24 +283,25 | |||
|
|
283 | 283 | return contest_problems |
|
|
284 | 284 | end |
|
|
285 | 285 | |
|
|
286 | 286 | def solve_all_available_problems? |
|
|
287 | 287 | available_problems.each do |p| |
|
|
288 | 288 | u = self |
|
|
289 | 289 | sub = Submission.find_last_by_user_and_problem(u.id,p.id) |
|
|
290 | 290 | return false if !p or !sub or sub.points < p.full_score |
|
|
291 | 291 | end |
|
|
292 | 292 | return true |
|
|
293 | 293 | end |
|
|
294 | 294 | |
|
|
295 | + #get a list of available problem | |
|
|
295 | 296 | def available_problems |
|
|
296 | 297 | if not GraderConfiguration.multicontests? |
|
|
297 | 298 | if GraderConfiguration.use_problem_group? |
|
|
298 | 299 | return available_problems_in_group |
|
|
299 | 300 | else |
|
|
300 | 301 | return Problem.available_problems |
|
|
301 | 302 | end |
|
|
302 | 303 | else |
|
|
303 | 304 | contest_problems = [] |
|
|
304 | 305 | pin = {} |
|
|
305 | 306 | contests.enabled.each do |contest| |
|
|
306 | 307 | contest.problems.available.each do |problem| |
| @@ -35,25 +35,25 | |||
|
|
35 | 35 | Test? |
|
|
36 | 36 | %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user uses test interface on this problem?' } [?] |
|
|
37 | 37 | - if GraderConfiguration.multicontests? |
|
|
38 | 38 | %th Contests |
|
|
39 | 39 | - for problem in @problems |
|
|
40 | 40 | %tr{:class => "#{(problem.available) ? "success" : "danger"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"} |
|
|
41 | 41 | - @problem=problem |
|
|
42 | 42 | %td= problem.name #in_place_editor_field :problem, :name, {}, :rows=>1 |
|
|
43 | 43 | %td |
|
|
44 | 44 | = problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1 |
|
|
45 | 45 | = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem |
|
|
46 | 46 | %td.text-right= problem.full_score #in_place_editor_field :problem, :full_score, {}, :rows=>1 |
|
|
47 | - %td= link_to "Submit", direct_edit_problem_submissions_path(problem), class: 'btn btn-xs btn-primary' | |
|
|
47 | + %td= link_to "Submit", direct_edit_problem_submissions_path(problem,@current_user.id), class: 'btn btn-xs btn-primary' | |
|
|
48 | 48 | %td= problem.date_added |
|
|
49 | 49 | %td= toggle_button(@problem.available?, toggle_problem_path(@problem), "problem-avail-#{@problem.id}") |
|
|
50 | 50 | %td= toggle_button(@problem.view_testcase?, toggle_view_testcase_problem_path(@problem), "problem-view-testcase-#{@problem.id}") |
|
|
51 | 51 | %td= toggle_button(@problem.test_allowed?, toggle_test_problem_path(@problem), "problem-test-#{@problem.id}") |
|
|
52 | 52 | - if GraderConfiguration.multicontests? |
|
|
53 | 53 | %td |
|
|
54 | 54 | = problem.contests.collect { |c| c.name }.join(', ') |
|
|
55 | 55 | %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-xs btn-block' |
|
|
56 | 56 | %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-xs btn-block' |
|
|
57 | 57 | %td= link_to 'Edit', {:action => 'edit', :id => problem}, class: 'btn btn-info btn-xs btn-block' |
|
|
58 | 58 | %td= link_to 'Destroy', { :action => 'destroy', :id => problem }, :confirm => 'Are you sure?', :method => :delete, class: 'btn btn-danger btn-xs btn-block' |
|
|
59 | 59 | %br/ |
| @@ -2,38 +2,40 | |||
|
|
2 | 2 | %br |
|
|
3 | 3 | |
|
|
4 | 4 | %textarea#text_sourcecode{style: "display:none"}~ @source |
|
|
5 | 5 | .container |
|
|
6 | 6 | .row |
|
|
7 | 7 | .col-md-12 |
|
|
8 | 8 | .alert.alert-info |
|
|
9 | 9 | Write your code in the following box, choose language, and click submit button when finished |
|
|
10 | 10 | .row |
|
|
11 | 11 | .col-md-8 |
|
|
12 | 12 | %div#editor{style: 'height: 500px; border-radius: 7px; font-size: 14px;'} |
|
|
13 | 13 | .col-md-4 |
|
|
14 | + - # submission form | |
|
|
14 | 15 | = form_tag({controller: :main, :action => 'submit'}, :multipart => true, class: 'form') do |
|
|
15 | 16 | |
|
|
16 | 17 | = hidden_field_tag 'editor_text', @source |
|
|
17 | 18 | = hidden_field_tag 'submission[problem_id]', @problem.id |
|
|
18 | 19 | .form-group |
|
|
19 | 20 | = label_tag "Task:" |
|
|
20 | 21 | = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true |
|
|
21 | 22 | |
|
|
22 | 23 | .form-group |
|
|
23 | 24 | = label_tag 'Language' |
|
|
24 | 25 | = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name', @lang_id || Language.find_by_pretty_name("Python").id || Language.first.id), class: 'form-control select', style: "width: 100px" |
|
|
25 | 26 | .form-group |
|
|
26 | 27 | = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit', |
|
|
27 | 28 | data: {confirm: "Submitting this source code for task #{@problem.long_name}?"} |
|
|
29 | + - # latest submission status | |
|
|
28 | 30 | .panel.panel-info |
|
|
29 | 31 | .panel-heading |
|
|
30 | 32 | Latest Submission Status |
|
|
31 | 33 | = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true if @submission |
|
|
32 | 34 | .panel-body |
|
|
33 | 35 | - if @submission |
|
|
34 | 36 | = render :partial => 'submission_short', |
|
|
35 | 37 | :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id } |
|
|
36 | 38 | .row |
|
|
37 | 39 | .col-md-12 |
|
|
38 | 40 | %h2 Console |
|
|
39 | 41 | %textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20} |
| @@ -64,25 +64,25 | |||
|
|
64 | 64 | get 'stat' |
|
|
65 | 65 | end |
|
|
66 | 66 | end |
|
|
67 | 67 | |
|
|
68 | 68 | resources :submissions do |
|
|
69 | 69 | member do |
|
|
70 | 70 | get 'download' |
|
|
71 | 71 | get 'compiler_msg' |
|
|
72 | 72 | get 'rejudge' |
|
|
73 | 73 | end |
|
|
74 | 74 | collection do |
|
|
75 | 75 | get 'prob/:problem_id', to: 'submissions#index', as: 'problem' |
|
|
76 | - get 'direct_edit_problem/:problem_id', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem' | |
|
|
76 | + get 'direct_edit_problem/:problem_id(/:user_id)', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem' | |
|
|
77 | 77 | get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status' |
|
|
78 | 78 | end |
|
|
79 | 79 | end |
|
|
80 | 80 | |
|
|
81 | 81 | |
|
|
82 | 82 | |
|
|
83 | 83 | #main |
|
|
84 | 84 | get "main/list" |
|
|
85 | 85 | get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission' |
|
|
86 | 86 | |
|
|
87 | 87 | #user admin |
|
|
88 | 88 | get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin' |
You need to be logged in to leave comments.
Login now