Description:
allow ta to set model submission
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r857:aa5ee227f493 - - 4 files changed: 13 inserted, 10 deleted
| @@ -88,13 +88,13 | |||
|
|
88 | 88 | |
|
|
89 | 89 | def admin? |
|
|
90 | 90 | has_role?('admin') |
|
|
91 | 91 | end |
|
|
92 | 92 | |
|
|
93 | 93 | def has_role?(role) |
|
|
94 | - self.roles.where(name: role).count > 0 | |
|
|
94 | + self.roles.where(name: [role,'admin']).count > 0 | |
|
|
95 | 95 | end |
|
|
96 | 96 | |
|
|
97 | 97 | def email_for_editing |
|
|
98 | 98 | if self.email==nil |
|
|
99 | 99 | "(unknown)" |
|
|
100 | 100 | elsif self.email=='' |
| @@ -51,18 +51,20 | |||
|
|
51 | 51 | .card |
|
|
52 | 52 | .card-body |
|
|
53 | 53 | %h2.card-title Model submission |
|
|
54 | 54 | %table.table.table-hover |
|
|
55 | 55 | %thead |
|
|
56 | 56 | %tr |
|
|
57 | - %th #Sub | |
|
|
57 | + %th #Sub (lang) | |
|
|
58 | 58 | %th Author |
|
|
59 | 59 | %tbody |
|
|
60 | 60 | - @model_subs.each do |sub| |
|
|
61 | 61 | %tr |
|
|
62 | - %td= link_to "##{sub.id}", submission_path(sub) | |
|
|
62 | + %td | |
|
|
63 | + = link_to "##{sub.id}", submission_path(sub) | |
|
|
64 | + = "(#{sub.language.pretty_name})" | |
|
|
63 | 65 | %td= sub.user.full_name |
|
|
64 | 66 | .col-md-8 |
|
|
65 | 67 | - if @best |
|
|
66 | 68 | .card |
|
|
67 | 69 | .card-body |
|
|
68 | 70 | %h2.card-title Top Submissions |
| @@ -19,11 +19,12 | |||
|
|
19 | 19 | |
|
|
20 | 20 | |
|
|
21 | 21 | - unless params[:id] |
|
|
22 | 22 | /=render partial: 'all_time_hof' |
|
|
23 | 23 | Please select a problem. |
|
|
24 | 24 | - else |
|
|
25 | - %h1 [#{Problem.find(params[:id]).name}] #{Problem.find(params[:id]).full_name} | |
|
|
26 | - -# %h2 Submission History | |
|
|
27 | - -# =render partial: 'application/bar_graph', locals: { histogram: @histogram } | |
|
|
25 | + %h1 | |
|
|
26 | + [#{Problem.find(params[:id]).name}] #{Problem.find(params[:id]).full_name} | |
|
|
27 | + - if @current_user.has_role?('ta') | |
|
|
28 | + %a{href:stat_problem_path(@problem)} (stat) | |
|
|
28 | 29 | =render partial: 'task_hof' |
|
|
29 | 30 | |
| @@ -91,30 +91,30 | |||
|
|
91 | 91 | view |
|
|
92 | 92 | %tr |
|
|
93 | 93 | %td.text-right |
|
|
94 | 94 | %strong Grading Task Status |
|
|
95 | 95 | %td |
|
|
96 | 96 | = @task.status_str if @task |
|
|
97 |
- - if |
|
|
|
97 | + - if @current_user.admin? | |
|
|
98 | 98 | = link_to "rejudge", rejudge_submission_path, data: {remote: true}, class: 'btn btn-info btn-xs' |
|
|
99 | - - if session[:admin] | |
|
|
99 | + - if @current_user.has_role?('ta') | |
|
|
100 | 100 | %tr |
|
|
101 | 101 | %td.text-right |
|
|
102 | 102 | %strong IP |
|
|
103 | 103 | %td #{@submission.ip_address} |
|
|
104 | 104 | %tr |
|
|
105 | 105 | %td.text-right |
|
|
106 | 106 | %strong Model solution |
|
|
107 | 107 | %td |
|
|
108 | 108 | - if @submission.tag_model? |
|
|
109 | 109 | YES |
|
|
110 |
- - if |
|
|
|
110 | + - if @current_user.has_role?('ta') | |
|
|
111 | 111 | = link_to "remove model status", set_tag_submission_path(@submission, tag: :default), class: 'btn btn-warning btn-xs' |
|
|
112 | 112 | - else |
|
|
113 | 113 | No |
|
|
114 |
- - if |
|
|
|
114 | + - if @current_user.has_role?('ta') | |
|
|
115 | 115 | = link_to "set as model solution", set_tag_submission_path(@submission, tag: :model), class: 'btn btn-success btn-xs' |
|
|
116 | 116 | |
|
|
117 | 117 | |
|
|
118 | 118 | .modal.fade#compiler{tabindex: -1,role: 'dialog'} |
|
|
119 | 119 | .modal-dialog.modal-lg{role:'document'} |
|
|
120 | 120 | .modal-content |
You need to be logged in to leave comments.
Login now