Description:
master
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r801:33c0929c92ed - - 23 files changed: 180 inserted, 96 deleted
| @@ -0,0 +1,8 | |||
|
|
1 | + = render partial: 'toggle_button', | |
|
|
2 | + locals: {button_id: "#group-enabled-#{@group.id}",button_on: @group.enabled } | |
|
|
3 | + :plain | |
|
|
4 | + r = $("#group-#{@group.id}"); | |
|
|
5 | + r.removeClass('success'); | |
|
|
6 | + r.removeClass('danger'); | |
|
|
7 | + r.addClass("#{@group.enabled? ? 'success' : 'danger'}"); | |
|
|
8 | + | |
| @@ -0,0 +1,5 | |||
|
|
1 | + class AddEnabledToGroup < ActiveRecord::Migration[5.2] | |
|
|
2 | + def change | |
|
|
3 | + add_column :groups, :enabled, :boolean, default: true | |
|
|
4 | + end | |
|
|
5 | + end | |
| @@ -152,8 +152,9 | |||
|
|
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 | + allowed = GraderConfiguration[WHITELIST_IP_CONF_KEY] || '' | |
|
|
155 | 156 | |
|
|
156 |
- |
|
|
|
157 | + allowed.delete(' ').split(',').each do |ips| | |
|
|
157 | 158 | allow_ips = IPAddr.new(ips) |
|
|
158 | 159 | if allow_ips.include?(user_ip) |
|
|
159 | 160 | return true |
| @@ -2,6 +2,7 | |||
|
|
2 | 2 | before_action :set_group, only: [:show, :edit, :update, :destroy, |
|
|
3 | 3 | :add_user, :remove_user,:remove_all_user, |
|
|
4 | 4 | :add_problem, :remove_problem,:remove_all_problem, |
|
|
5 | + :toggle, | |
|
|
5 | 6 | ] |
|
|
6 | 7 | before_action :admin_authorization |
|
|
7 | 8 | |
| @@ -49,6 +50,11 | |||
|
|
49 | 50 | redirect_to groups_url, notice: 'Group was successfully destroyed.' |
|
|
50 | 51 | end |
|
|
51 | 52 | |
|
|
53 | + def toggle | |
|
|
54 | + @group.enabled = @group.enabled? ? false : true | |
|
|
55 | + @group.save | |
|
|
56 | + end | |
|
|
57 | + | |
|
|
52 | 58 | def remove_user |
|
|
53 | 59 | user = User.find(params[:user_id]) |
|
|
54 | 60 | @group.users.delete(user) |
| @@ -99,6 +105,6 | |||
|
|
99 | 105 | |
|
|
100 | 106 | # Only allow a trusted parameter "white list" through. |
|
|
101 | 107 | def group_params |
|
|
102 | - params.require(:group).permit(:name, :description) | |
|
|
108 | + params.require(:group).permit(:name, :description, :enabled) | |
|
|
103 | 109 | end |
|
|
104 | 110 | end |
| @@ -16,8 +16,8 | |||
|
|
16 | 16 | else |
|
|
17 | 17 | @problem = Problem.find_by_id(params[:problem_id]) |
|
|
18 | 18 | if (@problem == nil) or (not @problem.available) |
|
|
19 |
- redirect_to |
|
|
|
20 | - flash[:notice] = 'Error: submissions for that problem are not viewable.' | |
|
|
19 | + redirect_to list_main_path | |
|
|
20 | + flash[:error] = 'Authorization error: You have no right to view submissions for this problem' | |
|
|
21 | 21 | return |
|
|
22 | 22 | end |
|
|
23 | 23 | @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id).order(id: :desc) |
| @@ -94,9 +94,8 | |||
|
|
94 | 94 | |
|
|
95 | 95 | def submission_authorization |
|
|
96 | 96 | #admin always has privileged |
|
|
97 | - if @current_user.admin? | |
|
|
98 | - return true | |
|
|
99 | - end | |
|
|
97 | + return true if @current_user.admin? | |
|
|
98 | + return true if @current_user.has_role?('TA') && (['show','download'].include? action_name) | |
|
|
100 | 99 | |
|
|
101 | 100 | sub = Submission.find(params[:id]) |
|
|
102 | 101 | if @current_user.available_problems.include? sub.problem |
| @@ -27,8 +27,9 | |||
|
|
27 | 27 | def download |
|
|
28 | 28 | problem = Problem.find(params[:id]) |
|
|
29 | 29 | unless @current_user.can_view_problem? problem |
|
|
30 |
- flash[: |
|
|
|
31 | - redirect_to :action => 'index' and return | |
|
|
30 | + flash[:error] = 'You are not authorized to access this file' | |
|
|
31 | + redirect_to list_main_path | |
|
|
32 | + return | |
|
|
32 | 33 | end |
|
|
33 | 34 | |
|
|
34 | 35 | base_name = params[:file] |
| @@ -37,7 +38,8 | |||
|
|
37 | 38 | |
|
|
38 | 39 | if !FileTest.exists?(filename) |
|
|
39 | 40 | flash[:notice] = 'File does not exists' |
|
|
40 | - redirect_to :action => 'index' and return | |
|
|
41 | + redirect_to list_main_path | |
|
|
42 | + return | |
|
|
41 | 43 | end |
|
|
42 | 44 | |
|
|
43 | 45 | send_file_to_user(filename, base_filename) |
| @@ -58,7 +58,8 | |||
|
|
58 | 58 | ok_user = [] |
|
|
59 | 59 | |
|
|
60 | 60 | lines.split("\n").each do |line| |
|
|
61 | - items = line.chomp.split(',') | |
|
|
61 | + #split with large limit, this will cause consecutive ',' to be result in a blank | |
|
|
62 | + items = line.chomp.split(',',1000) | |
|
|
62 | 63 | if items.length>=2 |
|
|
63 | 64 | login = items[0] |
|
|
64 | 65 | full_name = items[1] |
| @@ -66,8 +67,12 | |||
|
|
66 | 67 | user_alias = '' |
|
|
67 | 68 | |
|
|
68 | 69 | added_random_password = false |
|
|
69 | - if items.length >= 3 and items[2].chomp(" ").length > 0; | |
|
|
70 | + added_password = false | |
|
|
71 | + if items.length >= 3 | |
|
|
72 | + if items[2].chomp(" ").length > 0 | |
|
|
70 | 73 | password = items[2].chomp(" ") |
|
|
74 | + added_password = true | |
|
|
75 | + end | |
|
|
71 | 76 | else |
|
|
72 | 77 | password = random_password |
|
|
73 | 78 | added_random_password=true; |
| @@ -79,16 +84,21 | |||
|
|
79 | 84 | user_alias = login |
|
|
80 | 85 | end |
|
|
81 | 86 | |
|
|
87 | + | |
|
|
88 | + has_remark = false | |
|
|
82 | 89 | if items.length>=5 |
|
|
83 | 90 | remark = items[4].strip; |
|
|
91 | + has_remark = true | |
|
|
84 | 92 | end |
|
|
85 | 93 | |
|
|
86 | 94 | user = User.find_by_login(login) |
|
|
87 | 95 | if (user) |
|
|
88 | 96 | user.full_name = full_name |
|
|
89 | - user.password = password | |
|
|
90 | - user.remark = remark | |
|
|
97 | + user.remark = remark if has_remark | |
|
|
98 | + user.password = password if added_password || added_random_password | |
|
|
91 | 99 | else |
|
|
100 | + #create a random password if none are given | |
|
|
101 | + password = random_password unless password | |
|
|
92 | 102 | user = User.new({:login => login, |
|
|
93 | 103 | :full_name => full_name, |
|
|
94 | 104 | :password => password, |
| @@ -345,36 +355,33 | |||
|
|
345 | 355 | # admin management |
|
|
346 | 356 | |
|
|
347 | 357 | def admin |
|
|
348 | - @admins = User.all.find_all {|user| user.admin? } | |
|
|
358 | + @admins = Role.where(name: 'admin').take.users | |
|
|
359 | + @tas = Role.where(name: 'ta').take.users | |
|
|
349 | 360 | end |
|
|
350 | 361 | |
|
|
351 | - def grant_admin | |
|
|
352 |
- |
|
|
|
353 | - user = User.find_by_login(login) | |
|
|
354 | - if user!=nil | |
|
|
355 | - admin_role = Role.find_by_name('admin') | |
|
|
356 | - user.roles << admin_role | |
|
|
357 | - else | |
|
|
358 | - flash[:notice] = 'Unknown user' | |
|
|
359 | - end | |
|
|
360 | - flash[:notice] = 'User added as admins' | |
|
|
361 | - redirect_to :action => 'admin' | |
|
|
362 | + def modify_role | |
|
|
363 | + user = User.find_by_login(params[:login]) | |
|
|
364 | + role = Role.find_by_name(params[:role]) | |
|
|
365 | + unless user && role | |
|
|
366 | + flash[:error] = 'Unknown user or role' | |
|
|
367 | + redirect_to admin_user_admin_index_path | |
|
|
368 | + return | |
|
|
362 | 369 | end |
|
|
363 | - | |
|
|
364 | - def revoke_admin | |
|
|
365 | - user = User.find(params[:id]) | |
|
|
366 | - if user==nil | |
|
|
367 | - flash[:notice] = 'Unknown user' | |
|
|
368 | - redirect_to :action => 'admin' and return | |
|
|
369 |
- |
|
|
|
370 |
- flash[: |
|
|
|
371 | - redirect_to :action => 'admin' and return | |
|
|
370 | + if params[:commit] == 'Grant' | |
|
|
371 | + #grant role | |
|
|
372 | + user.roles << role | |
|
|
373 | + flash[:notice] = "User '#{user.login}' has been granted the role '#{role.name}'" | |
|
|
374 | + else | |
|
|
375 | + #revoke role | |
|
|
376 | + if user.login == 'root' && role.name == 'admin' | |
|
|
377 | + flash[:error] = 'You cannot revoke admisnistrator permission from root.' | |
|
|
378 | + redirect_to admin_user_admin_index_path | |
|
|
379 | + return | |
|
|
372 | 380 | end |
|
|
373 | - | |
|
|
374 | - admin_role = Role.find_by_name('admin') | |
|
|
375 | - user.roles.delete(admin_role) | |
|
|
376 | - flash[:notice] = 'User permission revoked' | |
|
|
377 | - redirect_to :action => 'admin' | |
|
|
381 | + user.roles.delete(role) | |
|
|
382 | + flash[:notice] = "The role '#{role.name}' has been revoked from User '#{user.login}'" | |
|
|
383 | + end | |
|
|
384 | + redirect_to admin_user_admin_index_path | |
|
|
378 | 385 | end |
|
|
379 | 386 | |
|
|
380 | 387 | # mass mailing |
| @@ -113,8 +113,9 | |||
|
|
113 | 113 | |
|
|
114 | 114 | def toggle_button(on,toggle_url,id, option={}) |
|
|
115 | 115 | btn_size = option[:size] || 'btn-xs' |
|
|
116 | + btn_block = option[:block] || 'btn-block' | |
|
|
116 | 117 | link_to (on ? "Yes" : "No"), toggle_url, |
|
|
117 |
- {class: "btn |
|
|
|
118 | + {class: "btn #{btn_block} #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle", | |
|
|
118 | 119 | id: id, |
|
|
119 | 120 | data: {remote: true, method: 'get'}} |
|
|
120 | 121 | end |
| @@ -181,9 +182,6 | |||
|
|
181 | 182 | #{header} |
|
|
182 | 183 | <tr> |
|
|
183 | 184 | <td class="left-col"> |
|
|
184 | - #{user.full_name}<br/> | |
|
|
185 | - #{t 'title_bar.current_time'} #{format_short_time(Time.zone.now)} | |
|
|
186 | - #{time_left} | |
|
|
187 | 185 | <br/> |
|
|
188 | 186 | </td> |
|
|
189 | 187 | <td class="right-col">#{contest_name}</td> |
| @@ -1,17 +1,11 | |||
|
|
1 | 1 | module MainHelper |
|
|
2 | 2 | |
|
|
3 |
- def link_to_description_if_any(name, problem |
|
|
|
3 | + def link_to_description_if_any(name, problem) | |
|
|
4 | 4 | if !problem.url.blank? |
|
|
5 |
- return link_to name, problem.url |
|
|
|
5 | + return link_to name, problem.url | |
|
|
6 | 6 | elsif !problem.description_filename.blank? |
|
|
7 | - #build a link to a problem (via task controller) | |
|
|
8 | 7 | basename, ext = problem.description_filename.split('.') |
|
|
9 | - options[:controller] = 'tasks' | |
|
|
10 | - options[:action] = 'download' | |
|
|
11 | - options[:id] = problem.id | |
|
|
12 | - options[:file] = basename | |
|
|
13 | - options[:ext] = ext | |
|
|
14 | - return link_to name, options | |
|
|
8 | + return link_to name, download_task_path(problem.id,basename,ext), target: '_blank' | |
|
|
15 | 9 | else |
|
|
16 | 10 | return '' |
|
|
17 | 11 | end |
| @@ -154,7 +154,7 | |||
|
|
154 | 154 | return if self.user.admin? |
|
|
155 | 155 | |
|
|
156 | 156 | #check if user has the right to submit the problem |
|
|
157 |
- errors |
|
|
|
157 | + errors[:base] << "Authorization error: you have no right to submit to this problem" if (!self.user.available_problems.include?(self.problem)) and (self.new_record?) | |
|
|
158 | 158 | end |
|
|
159 | 159 | end |
|
|
160 | 160 | |
| @@ -83,7 +83,11 | |||
|
|
83 | 83 | end |
|
|
84 | 84 | |
|
|
85 | 85 | def admin? |
|
|
86 | - self.roles.where(name: 'admin').count > 0 | |
|
|
86 | + has_role?('admin') | |
|
|
87 | + end | |
|
|
88 | + | |
|
|
89 | + def has_role?(role) | |
|
|
90 | + self.roles.where(name: role).count > 0 | |
|
|
87 | 91 | end |
|
|
88 | 92 | |
|
|
89 | 93 | def email_for_editing |
| @@ -275,9 +279,10 | |||
|
|
275 | 279 | end |
|
|
276 | 280 | end |
|
|
277 | 281 | |
|
|
282 | + # new feature, get list of available problem in all enabled group that the user belongs to | |
|
|
278 | 283 | def available_problems_in_group |
|
|
279 | 284 | problem = [] |
|
|
280 | - self.groups.each do |group| | |
|
|
285 | + self.groups.where(enabled: true).each do |group| | |
|
|
281 | 286 | group.problems.where(available: true).each { |p| problem << p } |
|
|
282 | 287 | end |
|
|
283 | 288 | problem.uniq! |
| @@ -298,6 +303,8 | |||
|
|
298 | 303 | end |
|
|
299 | 304 | end |
|
|
300 | 305 | |
|
|
306 | + #check if the user has the right to view that problem | |
|
|
307 | + #this also consider group based problem policy | |
|
|
301 | 308 | def can_view_problem?(problem) |
|
|
302 | 309 | return true if admin? |
|
|
303 | 310 | return available_problems.include? problem |
| @@ -10,7 +10,7 | |||
|
|
10 | 10 | %td |
|
|
11 | 11 | = submission.source_filename |
|
|
12 | 12 | = " (#{submission.language.pretty_name}) " |
|
|
13 | - = link_to('[load]',{:action => 'source', :id => submission.id}) | |
|
|
13 | + = link_to '[load]', download_submission_path(submission) | |
|
|
14 | 14 | %td |
|
|
15 | 15 | - if submission.graded_at |
|
|
16 | 16 | = "Graded at #{format_short_time(submission.graded_at)}." |
| @@ -10,10 +10,10 | |||
|
|
10 | 10 | .panel-heading |
|
|
11 | 11 | Grader control: |
|
|
12 | 12 | .panel-body |
|
|
13 |
- =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default' |
|
|
|
14 |
- =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default' |
|
|
|
15 |
- =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default' |
|
|
|
16 |
- =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default' |
|
|
|
13 | + =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default' | |
|
|
14 | + =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default' | |
|
|
15 | + =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default' | |
|
|
16 | + =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default' | |
|
|
17 | 17 | |
|
|
18 | 18 | .row |
|
|
19 | 19 | .col-md-6 |
| @@ -5,12 +5,23 | |||
|
|
5 | 5 | %ul |
|
|
6 | 6 | - @group.errors.full_messages.each do |msg| |
|
|
7 | 7 | %li= msg |
|
|
8 | - | |
|
|
8 | + .row | |
|
|
9 | + .col-md-6 | |
|
|
9 | 10 | .form-group.field |
|
|
10 | 11 | = f.label :name |
|
|
11 | 12 | = f.text_field :name, class: 'form-control' |
|
|
13 | + .row | |
|
|
14 | + .col-md-6 | |
|
|
12 | 15 | .form-group.field |
|
|
13 | 16 | = f.label :description |
|
|
14 | 17 | = f.text_field :description, class: 'form-control' |
|
|
18 | + .row | |
|
|
19 | + .col-md-6 | |
|
|
20 | + .checkbox | |
|
|
21 | + = f.label :enabled do | |
|
|
22 | + = f.check_box :enabled | |
|
|
23 | + Enabled | |
|
|
24 | + .row | |
|
|
25 | + .col-md-6 | |
|
|
15 | 26 | .form-group.actions |
|
|
16 | 27 | = f.submit 'Save', class: 'btn btn-primary' |
| @@ -7,14 +7,16 | |||
|
|
7 | 7 | %tr |
|
|
8 | 8 | %th Name |
|
|
9 | 9 | %th Description |
|
|
10 | + %th Enabled? | |
|
|
10 | 11 | %th |
|
|
11 | 12 | %th |
|
|
12 | 13 | |
|
|
13 | 14 | %tbody |
|
|
14 | 15 | - @groups.each do |group| |
|
|
15 | - %tr | |
|
|
16 | + %tr{:class => "#{(group.enabled?) ? "success" : "danger"}", id: "group-#{group.id}"} | |
|
|
16 | 17 | %td= group.name |
|
|
17 | 18 | %td= group.description |
|
|
19 | + %td= toggle_button(group.enabled?, toggle_group_path(group), "group-enabled-#{group.id}", size: ' ', block: ' ') | |
|
|
18 | 20 | %td= link_to 'View', group, class: 'btn btn-default' |
|
|
19 | 21 | %td= link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger' |
|
|
20 | 22 | |
| @@ -68,7 +68,7 | |||
|
|
68 | 68 | = add_menu( 'Login Report', 'report', 'login') |
|
|
69 | 69 | - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0 |
|
|
70 | 70 | =link_to "#{ungraded} backlogs!", |
|
|
71 | - grader_list_path, | |
|
|
71 | + graders_list_path, | |
|
|
72 | 72 | class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission' |
|
|
73 | 73 | |
|
|
74 | 74 | %ul.nav.navbar-nav.navbar-right |
| @@ -43,5 +43,5 | |||
|
|
43 | 43 | %tt <tt>{<br/>LANG: Pascal<br/>TASK: mobiles<br/>}</tt> |
|
|
44 | 44 | |
|
|
45 | 45 | %p |
|
|
46 |
- = raw(t('help.ask_questions_at_messages',:message_link_name => (t 'menu.messages'), |
|
|
|
46 | + = raw(t('help.ask_questions_at_messages',:message_link_name => (t 'menu.messages'),url: messages_path )) | |
|
|
47 | 47 | |
| @@ -6,19 +6,23 | |||
|
|
6 | 6 | %h1 Problem stat: #{@problem.name} |
|
|
7 | 7 | %h2 Overview |
|
|
8 | 8 | |
|
|
9 | + .row | |
|
|
10 | + .col-md-2 | |
|
|
11 | + %strong Name: | |
|
|
12 | + .col-md-10 | |
|
|
13 | + = @problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1 | |
|
|
14 | + = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, @problem | |
|
|
15 | + .row | |
|
|
16 | + .col-md-2.strong | |
|
|
17 | + %strong Submissions: | |
|
|
18 | + .col-md-10 | |
|
|
19 | + = @submissions.count | |
|
|
20 | + .row | |
|
|
21 | + .col-md-2.strong | |
|
|
22 | + %strong Solved/Attemped User | |
|
|
23 | + .col-md-10 | |
|
|
24 | + #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%) | |
|
|
9 | 25 | |
|
|
10 | - %table.info | |
|
|
11 | - %thead | |
|
|
12 | - %tr.info-head | |
|
|
13 | - %th Stat | |
|
|
14 | - %th Value | |
|
|
15 | - %tbody | |
|
|
16 | - %tr{class: cycle('info-even','info-odd')} | |
|
|
17 | - %td Submissions | |
|
|
18 | - %td= @submissions.count | |
|
|
19 | - %tr{class: cycle('info-even','info-odd')} | |
|
|
20 | - %td Solved/Attempted User | |
|
|
21 | - %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%) | |
|
|
22 | 26 | |
|
|
23 | 27 | %h2 Submissions Count |
|
|
24 | 28 | = render partial: 'application/bar_graph', locals: { histogram: @histogram } |
| @@ -42,6 +42,7 | |||
|
|
42 | 42 | - if @submission.problem!=nil |
|
|
43 | 43 | = link_to "[#{@submission.problem.name}]", stat_problem_path(@submission.problem) |
|
|
44 | 44 | = @submission.problem.full_name |
|
|
45 | + = link_to_description_if_any "[download] <span class='glyphicon glyphicon-file'></span>".html_safe, @submission.problem | |
|
|
45 | 46 | - else |
|
|
46 | 47 | = "(n/a)" |
|
|
47 | 48 | %tr |
| @@ -1,7 +1,17 | |||
|
|
1 | - %h1 Administrators | |
|
|
2 | - | |
|
|
3 | - %table{:class => 'info'} | |
|
|
4 | - %tr{:class => 'info-head'} | |
|
|
1 | + %h1 Modify Role | |
|
|
2 | + .row | |
|
|
3 | + .col-md-6 | |
|
|
4 | + %h4 Administrators | |
|
|
5 | + = form_tag modify_role_user_admin_index_path, method: 'post', class: 'form-inline' do | |
|
|
6 | + = hidden_field_tag :role, 'admin' | |
|
|
7 | + .form-group | |
|
|
8 | + = label_tag :login, 'Grant admin role to:' | |
|
|
9 | + = text_field_tag 'login',nil, class: 'form-control' | |
|
|
10 | + .form-group | |
|
|
11 | + = submit_tag 'Grant', class: 'btn btn-primary' | |
|
|
12 | + %br | |
|
|
13 | + %table.table.table-condense.table-hover.table-striped.table-bordered | |
|
|
14 | + %thead{:class => 'info-head'} | |
|
|
5 | 15 | %th # |
|
|
6 | 16 | %th Login |
|
|
7 | 17 | %th Full name |
| @@ -13,13 +23,32 | |||
|
|
13 | 23 | %td= user.full_name |
|
|
14 | 24 | %td |
|
|
15 | 25 | - if user.login!='root' |
|
|
16 | - = link_to '[revoke]', :action => 'revoke_admin', :id => user.id | |
|
|
17 | - %hr | |
|
|
26 | + = link_to '[revoke]', modify_role_user_admin_index_path( login: user.login, role: 'admin', commit: 'revoke') | |
|
|
27 | + .col-md-6 | |
|
|
28 | + %h4 Teacher Assistants (TA) | |
|
|
29 | + = form_tag modify_role_user_admin_index_path, method: 'post', class: 'form-inline' do | |
|
|
30 | + = hidden_field_tag :role, 'TA' | |
|
|
31 | + .form-group | |
|
|
32 | + = label_tag :login, 'Grant TA role to:' | |
|
|
33 | + = text_field_tag 'login',nil, class: 'form-control' | |
|
|
34 | + .form-group | |
|
|
35 | + = submit_tag 'Grant', class: 'btn btn-primary' | |
|
|
36 | + %br | |
|
|
37 | + %table.table.table-condense.table-hover.table-striped.table-bordered | |
|
|
38 | + %thead{:class => 'info-head'} | |
|
|
39 | + %th # | |
|
|
40 | + %th Login | |
|
|
41 | + %th Full name | |
|
|
42 | + %th | |
|
|
43 | + - @tas.each_with_index do |user, i| | |
|
|
44 | + %tr | |
|
|
45 | + %td= i+1 | |
|
|
46 | + %td= user.login | |
|
|
47 | + %td= user.full_name | |
|
|
48 | + %td | |
|
|
49 | + - if user.login!='root' | |
|
|
50 | + = link_to '[revoke]', modify_role_user_admin_index_path( login: user.login, role: 'TA', commit: 'revoke') | |
|
|
18 | 51 | |
|
|
19 | - = form_tag :action => 'grant_admin' do | |
|
|
20 | - = label_tag :login, 'Grant admin permission to:' | |
|
|
21 | - = text_field_tag 'login',nil, class: 'input-field' | |
|
|
22 | - = submit_tag 'Grant', class: 'btn btn-primary' | |
|
|
23 | 52 | |
|
|
24 | 53 | %hr/ |
|
|
25 | 54 | = link_to '[go back to index]', :action => 'index' |
| @@ -26,6 +26,15 | |||
|
|
26 | 26 | is empty, the original value will be used instead. |
|
|
27 | 27 | %li |
|
|
28 | 28 | If the users with the same user_id already exists, existing information will be overwritten. |
|
|
29 | + Example: | |
|
|
30 | + %ol | |
|
|
31 | + %li | |
|
|
32 | + %pre user1,Somchai Jaidee | |
|
|
33 | + will create (or update) a user with login "user1" and setting the fullname to "Somchai Jaidee", also setting a random password. | |
|
|
34 | + %li | |
|
|
35 | + %pre user1,Somchai Jaidee, | |
|
|
36 | + will create (or update) a user with login "user1" and and setting the fullname "Somchai Jaidee". No change is made to the password unless this is a new user. If this is a new user, a random password will be generated. | |
|
|
37 | + | |
|
|
29 | 38 | |
|
|
30 | 39 | .row |
|
|
31 | 40 | .col-md-6 |
| @@ -54,6 +54,7 | |||
|
|
54 | 54 | post 'add_problem', to: 'groups#add_problem', as: 'add_problem' |
|
|
55 | 55 | delete 'remove_problem/:problem_id', to: 'groups#remove_problem', as: 'remove_problem' |
|
|
56 | 56 | delete 'remove_all_problem', to: 'groups#remove_all_problem', as: 'remove_all_problem' |
|
|
57 | + get 'toggle' | |
|
|
57 | 58 | end |
|
|
58 | 59 | collection do |
|
|
59 | 60 | |
| @@ -92,7 +93,6 | |||
|
|
92 | 93 | get 'download' |
|
|
93 | 94 | get 'compiler_msg' |
|
|
94 | 95 | get 'rejudge' |
|
|
95 | - get 'source' | |
|
|
96 | 96 | end |
|
|
97 | 97 | collection do |
|
|
98 | 98 | get 'prob/:problem_id', to: 'submissions#index', as: 'problem' |
| @@ -113,8 +113,7 | |||
|
|
113 | 113 | get 'admin' |
|
|
114 | 114 | get 'active' |
|
|
115 | 115 | get 'mass_mailing' |
|
|
116 | - get 'revoke_admin' | |
|
|
117 | - post 'grant_admin' | |
|
|
116 | + match 'modify_role', via: [:get, :post] | |
|
|
118 | 117 | match 'create_from_list', via: [:get, :post] |
|
|
119 | 118 | match 'random_all_passwords', via: [:get, :post] |
|
|
120 | 119 | end |
| @@ -184,22 +183,23 | |||
|
|
184 | 183 | |
|
|
185 | 184 | # |
|
|
186 | 185 | get 'tasks/view/:file.:ext' => 'tasks#view' |
|
|
187 | - get 'tasks/download/:id/:file.:ext' => 'tasks#download' | |
|
|
186 | + get 'tasks/download/:id/:file.:ext' => 'tasks#download', as: 'download_task' | |
|
|
188 | 187 | get 'heartbeat/:id/edit' => 'heartbeat#edit' |
|
|
189 | 188 | |
|
|
190 | 189 | #grader |
|
|
191 | - get 'graders/list', to: 'graders#list', as: 'grader_list' | |
|
|
190 | + #get 'graders/list', to: 'graders#list', as: 'grader_list' | |
|
|
192 | 191 | namespace :graders do |
|
|
193 | 192 | get 'task/:id/:type', action: 'task', as: 'task' |
|
|
194 | 193 | get 'view/:id/:type', action: 'view', as: 'view' |
|
|
195 | 194 | get 'clear/:id', action: 'clear', as: 'clear' |
|
|
196 | - get 'stop' | |
|
|
197 | - get 'stop_all' | |
|
|
198 | - get 'clear_all' | |
|
|
199 | - get 'clear_terminated' | |
|
|
200 | 195 | get 'start_grading' |
|
|
201 | 196 | get 'start_exam' |
|
|
197 | + get 'clear_all' | |
|
|
198 | + get 'stop_all' | |
|
|
202 | 199 | |
|
|
200 | + get 'stop' | |
|
|
201 | + get 'clear_terminated' | |
|
|
202 | + get 'list' | |
|
|
203 | 203 | end |
|
|
204 | 204 | |
|
|
205 | 205 | |
You need to be logged in to leave comments.
Login now