cafe-grader-web Commit - r836:36fbb20457ec

cafe-grader-web

Commit `r836:36fbb20457ec` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r836:36fbb20457ec - Mon, 21 Sep 2020 14:03:35 - 8 files changed: 94 inserted, 60 deleted

app/controllers/submissions_controller.rb ¶ +2 -3

                 end
               protected
                 def submission_authorization
                   #admin always has privileged
-            -     if @current_user.admin?
+            +     return true if @current_user.admin?
-            -       return true
+            +     return true if @current_user.has_role?('TA') && (['show','download'].include? action_name)
-            -     end
                   sub = Submission.find(params[:id])
                   if @current_user.available_problems.include? sub.problem
                     return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user
                   end

app/controllers/user_admin_controller.rb ¶ +23 -26

@@ -352,42 +352,39
352	redirect_to :action => 'contest_management'	352	redirect_to :action => 'contest_management'
353	end	353	end
354		354
355	# admin management	355	# admin management
356		356
357	def admin	357	def admin
358	- @admins = User.all.find_all {\|user\| user.admin? }	358	+ @admins = Role.where(name: 'admin').take.users
		359	+ @tas = Role.where(name: 'ta').take.users
359	end	360	end
360		361
361	- def grant_admin	362	+ def modify_role
362	- ~~login~~ = params[:login]	363	+ user = User.find_by_login(params[:login])
363	- user = User.find_by_login(login)	364	+ role = Role.find_by_name(params[:role])
364	- if user!=nil	365	+ unless user && role
365	- admin_role = Role.find_by_name('admin')	366	+ flash[:error] = 'Unknown user or role'
366	- user.roles << admin_role	367	+ redirect_to admin_user_admin_index_path
367	- else	368	+ return
368	- flash[:notice] = 'Unknown user'
369	- end
370	- flash[:notice] = 'User added as admins'
371	- redirect_to :action => 'admin'
372	end	369	end
373	-	370	+ if params[:commit] == 'Grant'
374	- def revoke_admin	371	+ #grant role
375	- user = User.find(params[:id])	372	+ user.roles << role
376	- if user==nil	373	+ flash[:notice] = "User '#{user.login}' has been granted the role '#{role.name}'"
377	- flash[:notice] = 'Unknown user'	374	+ else
378	- redirect_to :action => 'admin' and return	375	+ #revoke role
379	- ~~els~~if user.login == 'root'	376	+ if user.login == 'root' && role.name == 'admin'
380	- flash[:~~notice~~] = 'You cannot revoke admisnistrator permission from root.'	377	+ flash[:error] = 'You cannot revoke admisnistrator permission from root.'
381	- redirect_to :action => 'admin' and return	378	+ redirect_to admin_user_admin_index_path
		379	+ return
382	end	380	end
383	-	381	+ user.roles.delete(role)
384	- admin_role = Role.find_by_name('admin')	382	+ flash[:notice] = "The role '#{role.name}' has been revoked from User '#{user.login}'"
385	- user.roles.delete(admin_role)	383	+ end
386	- flash[:notice] = 'User permission revoked'	384	+ redirect_to admin_user_admin_index_path
387	- redirect_to :action => 'admin'
388	end	385	end
389		386
390	# mass mailing	387	# mass mailing
391		388
392	def mass_mailing	389	def mass_mailing
393	end	390	end

app/models/user.rb ¶ +5 -1

                     return false
                   end
                   return false
                 end
                 def admin?
-            -     self.roles.where(name: 'admin').count > 0
+            +     has_role?('admin')
+            +   end
+            +
+            +   def has_role?(role)
+            +     self.roles.where(name: role).count > 0
                 end
                 def email_for_editing
                   if self.email==nil
                     "(unknown)"
                   elsif self.email==''

app/views/layouts/_header.html.haml ¶ +1 -1

                               = add_menu( 'Current Score', 'report', 'current_score')
                               = add_menu( 'Score Report', 'report', 'max_score')
                               = add_menu( 'Submission Report', 'report', 'submission')
                               = add_menu( 'Login Report', 'report', 'login')
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =link_to "#{ungraded} backlogs!",
-            -                 grader_list_path,
+            +                 graders_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                       %ul.nav.navbar-nav.navbar-right
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'index', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                         - if GraderConfiguration['system.user_setting_enabled']

app/views/problems/stat.html.haml ¶ +16 -12

@@ -3,25 +3,29
3	font-family: "Consolas, Monaco, Droid Sans Mono,Mono, Monospace,Courier"	3	font-family: "Consolas, Monaco, Droid Sans Mono,Mono, Monospace,Courier"
4	}	4	}
5		5
6	%h1 Problem stat: #{@problem.name}	6	%h1 Problem stat: #{@problem.name}
7	%h2 Overview	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	%h2 Submissions Count	27	%h2 Submissions Count
24	= render partial: 'application/bar_graph', locals: { histogram: @histogram }	28	= render partial: 'application/bar_graph', locals: { histogram: @histogram }
25		29
26	%h2 Submissions	30	%h2 Submissions
27	- if @submissions and @submissions.count > 0	31	- if @submissions and @submissions.count > 0

app/views/user_admin/admin.html.haml ¶ +39 -10

@@ -1,25 +1,54
1	- %h1 Administrators	1	+ %h1 Modify Role
2	-	2	+ .row
3	- %table{:class => 'info'}	3	+ .col-md-6
4	- %tr{:class => 'info-head'}	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	%th #	15	%th #
6	%th Login	16	%th Login
7	%th Full name	17	%th Full name
8	%th	18	%th
9	- @admins.each_with_index do \|user, i\|	19	- @admins.each_with_index do \|user, i\|
10	%tr	20	%tr
11	%td= i+1	21	%td= i+1
12	%td= user.login	22	%td= user.login
13	%td= user.full_name	23	%td= user.full_name
14	%td	24	%td
15	- if user.login!='root'	25	- if user.login!='root'
16	- = link_to '[revoke]', :action => 'revoke_admin', :id => user.id	26	+ = link_to '[revoke]', modify_role_user_admin_index_path( login: user.login, role: 'admin', commit: 'revoke')
17	- %hr	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	%hr/	53	%hr/
25	= link_to '[go back to index]', :action => 'index'	54	= link_to '[go back to index]', :action => 'index'

config/routes.rb ¶ +7 -7

                     get 'user_stat'
                     get 'import'
                     get 'new_list'
                     get 'admin'
                     get 'active'
                     get 'mass_mailing'
-            -       get 'revoke_admin'
+            +       match 'modify_role', via: [:get, :post]
-            -       post 'grant_admin'
                     match 'create_from_list', via: [:get, :post]
                     match 'random_all_passwords', via: [:get, :post]
                   end
                   member do
                     get 'clear_last_ip'
                   end
                 #
                 get 'tasks/view/:file.:ext' => 'tasks#view'
                 get 'tasks/download/:id/:file.:ext' => 'tasks#download', as: 'download_task'
                 get 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #grader
-            -   get 'graders/list', to: 'graders#list', as: 'grader_list'
+            +   #get 'graders/list', to: 'graders#list', as: 'grader_list'
                 namespace :graders do
                   get 'task/:id/:type', action: 'task', as: 'task'
                   get 'view/:id/:type', action: 'view', as: 'view'
                   get 'clear/:id', action: 'clear', as: 'clear'
-            -     get 'stop'
-            -     get 'stop_all'
-            -     get 'clear_all'
-            -     get 'clear_terminated'
                   get 'start_grading'
                   get 'start_exam'
+            +     get 'clear_all'
+            +     get 'stop_all'
+            +     get 'stop'
+            +     get 'clear_terminated'
+            +     get 'list'
                 end
                 # See how all your routes lay out with "rake routes"
                 # This is a legacy wild controller route that's not recommended for RESTful applications.

db/seeds.rb ¶ +1

                                            conf[:default_value],
                                            desc)
                 end
               end
               def seed_roles
+            +   Role.find_or_create_by(name: 'TA')
                 return if Role.find_by_name('admin')
                 role = Role.create(:name => 'admin')
                 user_admin_right = Right.create(:name => 'user_admin',
                                                 :controller => 'user_admin',
                                                 :action => 'all')

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r836:36fbb20457ec - Mon, 21 Sep 2020 14:03:35 - 8 files changed: 94 inserted, 60 deleted

Sign in to your account

Commit r836:36fbb20457ec public

Author

r836:36fbb20457ec - Mon, 21 Sep 2020 14:03:35 - 8 files changed: 94 inserted, 60 deleted

Commit `r836:36fbb20457ec` public