Description:
add link to announcement management in main
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r651:23fc3f2d9ad1 - - 2 files changed: 1 inserted, 1 deleted
| @@ -76,25 +76,24 | |||||
|
|
76 | end |
|
76 | end |
|
|
77 |
|
77 | ||
|
|
78 | # GET /submissions/:id/rejudge |
|
78 | # GET /submissions/:id/rejudge |
|
|
79 | def rejudge |
|
79 | def rejudge |
|
|
80 | @submission = Submission.find(params[:id]) |
|
80 | @submission = Submission.find(params[:id]) |
|
|
81 | @task = @submission.task |
|
81 | @task = @submission.task |
|
|
82 | @task.status_inqueue! if @task |
|
82 | @task.status_inqueue! if @task |
|
|
83 | respond_to do |format| |
|
83 | respond_to do |format| |
|
|
84 | format.js |
|
84 | format.js |
|
|
85 | end |
|
85 | end |
|
|
86 | end |
|
86 | end |
|
|
87 |
|
87 | ||
|
|
88 | - |
|
||
|
|
89 | protected |
|
88 | protected |
|
|
90 |
|
89 | ||
|
|
91 | def submission_authorization |
|
90 | def submission_authorization |
|
|
92 | #admin always has privileged |
|
91 | #admin always has privileged |
|
|
93 | if @current_user.admin? |
|
92 | if @current_user.admin? |
|
|
94 | return true |
|
93 | return true |
|
|
95 | end |
|
94 | end |
|
|
96 |
|
95 | ||
|
|
97 | sub = Submission.find(params[:id]) |
|
96 | sub = Submission.find(params[:id]) |
|
|
98 | if sub.problem.available? |
|
97 | if sub.problem.available? |
|
|
99 | puts "sub = #{sub.user.id}, current = #{@current_user.id}" |
|
98 | puts "sub = #{sub.user.id}, current = #{@current_user.id}" |
|
|
100 | return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user |
|
99 | return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user |
| @@ -34,24 +34,25 | |||||
|
|
34 | %table.info |
|
34 | %table.info |
|
|
35 | %tr.info-head |
|
35 | %tr.info-head |
|
|
36 | %th Task name |
|
36 | %th Task name |
|
|
37 | %th Full name |
|
37 | %th Full name |
|
|
38 | %th # of sub(s) |
|
38 | %th # of sub(s) |
|
|
39 | %th Results |
|
39 | %th Results |
|
|
40 | %th |
|
40 | %th |
|
|
41 | = render :partial => 'problem', :collection => cp[:problems] |
|
41 | = render :partial => 'problem', :collection => cp[:problems] |
|
|
42 | .col-md-5 |
|
42 | .col-md-5 |
|
|
43 | .panel.panel-info |
|
43 | .panel.panel-info |
|
|
44 | .panel-heading |
|
44 | .panel-heading |
|
|
45 | Announcement |
|
45 | Announcement |
|
|
|
46 | + = link_to 'Manage', announcements_path, class: 'btn btn-xs btn-default' | ||
|
|
46 | %ul.list-group |
|
47 | %ul.list-group |
|
|
47 | = render :partial => 'announcement', :collection => @announcements |
|
48 | = render :partial => 'announcement', :collection => @announcements |
|
|
48 |
|
49 | ||
|
|
49 | %script{:type => 'text/javascript'} |
|
50 | %script{:type => 'text/javascript'} |
|
|
50 | = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';" |
|
51 | = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';" |
|
|
51 | Announcement.registerRefreshEventTimer(); |
|
52 | Announcement.registerRefreshEventTimer(); |
|
|
52 |
|
53 | ||
|
|
53 | .modal.fade#compiler{tabindex: -1,role: 'dialog'} |
|
54 | .modal.fade#compiler{tabindex: -1,role: 'dialog'} |
|
|
54 | .modal-dialog.modal-lg{role:'document'} |
|
55 | .modal-dialog.modal-lg{role:'document'} |
|
|
55 | .modal-content |
|
56 | .modal-content |
|
|
56 | .modal-header |
|
57 | .modal-header |
|
|
57 | %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}} |
|
58 | %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}} |
You need to be logged in to leave comments.
Login now