cafe-grader-web Commit - r801:33c0929c92ed

cafe-grader-web

Commit `r801:33c0929c92ed` public

parent | child

Description:

master

Commit status:

[Not Reviewed]

References:

merge default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r801:33c0929c92ed - Mon, 21 Sep 2020 14:13:04 - 23 files changed: 180 inserted, 96 deleted

app/views/groups/toggle.js.haml created 644 ¶ +8

@@ -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	+

db/migrate/20200813083020_add_enabled_to_group.rb created 644 ¶ +5

@@ -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

app/controllers/application_controller.rb ¶ +2 -1

                   return true if user==nil || user.site == nil
                   if user.contest_finished?
                     flash[:notice] = 'Error: the contest you are participating is over.'
                     redirect_to :back
                     return false
                   end
                   return true
                 end
                 def is_request_ip_allowed?
                   unless GraderConfiguration[WHITELIST_IGNORE_CONF_KEY]
                     user_ip = IPAddr.new(request.remote_ip)
+            +       allowed = GraderConfiguration[WHITELIST_IP_CONF_KEY] || ''
-            -       GraderConfiguration[WHITELIST_IP_CONF_KEY].delete(' ').split(',').each do |ips|
+            +       allowed.delete(' ').split(',').each do |ips|
                       allow_ips = IPAddr.new(ips)
                       if allow_ips.include?(user_ip)
                         return true
                       end
                     end
                     return false
                   end
                   return true
                 end
                 #function for datatable ajax query
                 #return record,total_count,filter_count

app/controllers/groups_controller.rb ¶ +7 -1

               class GroupsController < ApplicationController
                 before_action :set_group, only: [:show, :edit, :update, :destroy,
                                                  :add_user, :remove_user,:remove_all_user,
                                                  :add_problem, :remove_problem,:remove_all_problem,
+            +                                    :toggle,
                                                 ]
                 before_action :admin_authorization
                 # GET /groups
                 def index
                   @groups = Group.all
                 end
                 # GET /groups/1
                 def show
                 end
                     redirect_to @group, notice: 'Group was successfully updated.'
                   else
                     render :edit
                   end
                 end
                 # DELETE /groups/1
                 def destroy
                   @group.destroy
                   redirect_to groups_url, notice: 'Group was successfully destroyed.'
                 end
+            +   def toggle
+            +     @group.enabled = @group.enabled? ? false : true
+            +     @group.save
+            +   end
+            +
                 def remove_user
                   user = User.find(params[:user_id])
                   @group.users.delete(user)
                   redirect_to group_path(@group), flash: {success: "User #{user.login} was removed from the group #{@group.name}"}
                 end
                 def remove_all_user
                   @group.users.clear
                   redirect_to group_path(@group), alert: 'All users removed'
                 end
                 def remove_all_problem
                     redirect_to group_path(@group), alert: e.message
                   end
                 end
                 private
                   # Use callbacks to share common setup or constraints between actions.
                   def set_group
                     @group = Group.find(params[:id])
                   end
                   # Only allow a trusted parameter "white list" through.
                   def group_params
-            -       params.require(:group).permit(:name, :description)
+            +       params.require(:group).permit(:name, :description, :enabled)
                   end
               end

app/controllers/submissions_controller.rb ¶ +4 -5

                 # GET /submissions.json
                 # Show problem selection and user's submission of that problem
                 def index
                   @user = @current_user
                   @problems = @user.available_problems
                   if params[:problem_id]==nil
                     @problem = nil
                     @submissions = nil
                   else
                     @problem = Problem.find_by_id(params[:problem_id])
                     if (@problem == nil) or (not @problem.available)
-            -         redirect_to main_list_path
+            +         redirect_to list_main_path
-            -         flash[:notice] = 'Error: submissions for that problem are not viewable.'
+            +         flash[:error] = 'Authorization error: You have no right to view submissions for this problem'
                       return
                     end
                     @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id).order(id: :desc)
                   end
                 end
                 # GET /submissions/1
                 # GET /submissions/1.json
                 def show
                   @submission = Submission.find(params[:id])
                   #log the viewing
                   @submission = Submission.find(params[:id])
                   @task = @submission.task
                   @task.status_inqueue! if @task
                   respond_to do |format|
                     format.js
                   end
                 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
                   #default to NO
                   unauthorized_redirect
                   return false
                 end

app/controllers/tasks_controller.rb ¶ +5 -3

                   if !FileTest.exists?(filename)
                     redirect_to :action => 'index' and return
                   end
                   send_file_to_user(filename, base_filename)
                 end
                 # this has problem-level access control
                 def download
                   problem = Problem.find(params[:id])
                   unless @current_user.can_view_problem? problem
-            -       flash[:notice] = 'You are not authorized to access this file'
+            +       flash[:error] = 'You are not authorized to access this file'
-            -       redirect_to :action => 'index' and return
+            +       redirect_to list_main_path
+            +       return
                   end
                   base_name = params[:file]
                   base_filename = File.basename("#{base_name}.#{params[:ext]}")
                   filename = "#{Problem.download_file_basedir}/#{params[:id]}/#{base_filename}"
                   if !FileTest.exists?(filename)
                     flash[:notice] = 'File does not exists'
-            -       redirect_to :action => 'index' and return
+            +       redirect_to list_main_path
+            +       return
                   end
                   send_file_to_user(filename, base_filename)
                 end
                 protected
                 def send_file_to_user(filename, base_filename)
                   if defined?(USE_APACHE_XSENDFILE) and USE_APACHE_XSENDFILE
                     response.headers['Content-Type'] = "application/force-download"
                     response.headers['Content-Disposition'] = "attachment; filename=\"#{File.basename(filename)}\""
                     response.headers["X-Sendfile"] = filename

app/controllers/user_admin_controller.rb ¶ +37 -30

                   redirect_to action: 'index', page: params[:page]
                 end
                 def create_from_list
                   lines = params[:user_list]
                   note = []
                   error_note = []
                   error_msg = nil
                   ok_user = []
                   lines.split("\n").each do |line|
-            -       items = line.chomp.split(',')
+            +       #split with large limit, this will cause consecutive ',' to be result in a blank
+            +       items = line.chomp.split(',',1000)
                     if items.length>=2
                       login = items[0]
                       full_name = items[1]
                       remark =''
                       user_alias = ''
                       added_random_password = false
-            -         if items.length >= 3 and items[2].chomp(" ").length > 0;
+            +         added_password = false
+            +         if items.length >= 3
+            +           if items[2].chomp(" ").length > 0
                           password = items[2].chomp(" ")
+            +             added_password = true
+            +           end
                       else
                         password = random_password
                         added_random_password=true;
                       end
                       if items.length>= 4 and items[3].chomp(" ").length > 0;
                         user_alias = items[3].chomp(" ")
                       else
                         user_alias = login
                       end
+            +
+            +         has_remark = false
                       if items.length>=5
                         remark = items[4].strip;
+            +           has_remark = true
                       end
                       user = User.find_by_login(login)
                       if (user)
                         user.full_name = full_name
-            -           user.password = password
+            +           user.remark = remark if has_remark
-            -           user.remark = remark
+            +           user.password = password if added_password || added_random_password
                       else
+            +           #create a random password if none are given
+            +           password = random_password unless password
                         user = User.new({:login => login,
                                          :full_name => full_name,
                                          :password => password,
                                          :password_confirmation => password,
                                          :alias => user_alias,
                                          :remark => remark})
                       end
                       user.activated = true
                       if user.save
                         if added_random_password
                           note << "'#{login}' (+)"
                   if params[:reset_timer]
                     logout_users(users)
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'contest_management'
                 end
                 # admin management
                 def admin
-            -     @admins = User.all.find_all {|user| user.admin? }
+            +     @admins = Role.where(name: 'admin').take.users
+            +     @tas = Role.where(name: 'ta').take.users
                 end
-            -   def grant_admin
+            +   def modify_role
-            -     login = params[:login]
+            +     user = User.find_by_login(params[:login])
-            -     user = User.find_by_login(login)
+            +     role = Role.find_by_name(params[:role])
-            -     if user!=nil
+            +     unless user && role
-            -       admin_role = Role.find_by_name('admin')
+            +       flash[:error] = 'Unknown user or role'
-            -       user.roles << admin_role
+            +       redirect_to admin_user_admin_index_path
-            -     else
+            +       return
-            -       flash[:notice] = 'Unknown user'
-            -     end
-            -     flash[:notice] = 'User added as admins'
-            -     redirect_to :action => 'admin'
                   end
+            +     if params[:commit] == 'Grant'
-            -   def revoke_admin
+            +       #grant role
-            -     user = User.find(params[:id])
+            +       user.roles << role
-            -     if user==nil
+            +       flash[:notice] = "User '#{user.login}' has been granted the role '#{role.name}'"
-            -       flash[:notice] = 'Unknown user'
+            +     else
-            -       redirect_to :action => 'admin' and return
+            +       #revoke role
-            -     elsif user.login == 'root'
+            +       if user.login == 'root' && role.name == 'admin'
-            -       flash[:notice] = 'You cannot revoke admisnistrator permission from root.'
+            +         flash[:error] = 'You cannot revoke admisnistrator permission from root.'
-            -       redirect_to :action => 'admin' and return
+            +         redirect_to admin_user_admin_index_path
+            +         return
                     end
+            +       user.roles.delete(role)
-            -     admin_role = Role.find_by_name('admin')
+            +       flash[:notice] = "The role '#{role.name}' has been revoked from User '#{user.login}'"
-            -     user.roles.delete(admin_role)
+            +     end
-            -     flash[:notice] = 'User permission revoked'
+            +     redirect_to admin_user_admin_index_path
-            -     redirect_to :action => 'admin'
                 end
                 # mass mailing
                 def mass_mailing
                 end
                 def bulk_mail
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'mass_mailing' and return

app/helpers/application_helper.rb ¶ +2 -4

                 end
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
                 def toggle_button(on,toggle_url,id, option={})
                   btn_size = option[:size] || 'btn-xs'
+            +     btn_block = option[:block] || 'btn-block'
                   link_to (on ? "Yes" : "No"), toggle_url,
-            -       {class: "btn btn-block #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle",
+            +       {class: "btn #{btn_block} #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle",
                       id: id,
                       data: {remote: true, method: 'get'}}
                 end
                 def get_ace_mode(language)
                   # return ace mode string from Language
                   case language.pretty_name
                     when 'Pascal'
                       'ace/mode/pascal'
                     when 'C++','C'
                       'ace/mode/c_cpp'
                   end
                   contest_name = GraderConfiguration['contest.name']
                   #
                   # build real title bar
                   result = <<TITLEBAR
               <div class="title">
               <table>
               #{header}
               <tr>
               <td class="left-col">
-            - #{user.full_name}<br/>
-            - #{t 'title_bar.current_time'} #{format_short_time(Time.zone.now)}
-            - #{time_left}
               <br/>
               </td>
               <td class="right-col">#{contest_name}</td>
               </tr>
               </table>
               </div>
               TITLEBAR
                   result.html_safe
                 end
                 def markdown(text)
                   markdown = RDiscount.new(text)

app/helpers/main_helper.rb ¶ +3 -9

               module MainHelper
-            -   def link_to_description_if_any(name, problem, options={})
+            +   def link_to_description_if_any(name, problem)
                   if !problem.url.blank?
-            -       return link_to name, problem.url, options
+            +       return link_to name, problem.url
                   elsif !problem.description_filename.blank?
-            -       #build a link to a problem (via task controller)
                     basename, ext = problem.description_filename.split('.')
-            -       options[:controller] = 'tasks'
+            +       return link_to name, download_task_path(problem.id,basename,ext), target: '_blank'
-            -       options[:action] = 'download'
-            -       options[:id] = problem.id
-            -       options[:file] = basename
-            -       options[:ext] = ext
-            -       return link_to name, options
                   else
                     return ''
                   end
                 end
               end

app/models/submission.rb ¶ +1 -1

                   end
                 end
                 def must_have_valid_problem
                   return if self.source==nil
                   if self.problem==nil
                     errors.add('problem',"must be specified.")
                   else
                     #admin always have right
                     return if self.user.admin?
                     #check if user has the right to submit the problem
-            -       errors.add('problem',"must be valid.") if (!self.user.available_problems.include?(self.problem)) and (self.new_record?)
+            +       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?)
                   end
                 end
                 # callbacks
                 def assign_latest_number_if_new_recond
                   return if !self.new_record?
                   latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id)
                   self.number = (latest==nil) ? 1 : latest.number + 1;
                 end
               end

app/models/user.rb ¶ +9 -2

                   end
                 end
                 def authenticated?(password)
                   if self.activated
                     hashed_password == User.encrypt(password,self.salt)
                   else
                     false
                   end
                 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==''
                     "(blank)"
                   else
                     self.email
                   end
                 end
                       contest.problems.available.each do |problem|
                         if not pin.has_key? problem.id
                           contest_problems << problem
                         end
                         pin[problem.id] = true
                       end
                     end
                     other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                     return contest_problems + other_avaiable_problems
                   end
                 end
+            +   # new feature, get list of available problem in all enabled group that the user belongs to
                 def available_problems_in_group
                   problem = []
-            -     self.groups.each do |group|
+            +     self.groups.where(enabled: true).each do |group|
                     group.problems.where(available: true).each { |p| problem << p }
                   end
                   problem.uniq!
                   if problem
                     problem.sort! do |a,b|
                       case
                       when a.date_added < b.date_added
                       when a.date_added > b.date_added
                         -1
                       else
                         a.name <=> b.name
                       end
                     end
                     return problem
                   else
                     return []
                   end
                 end
+            +   #check if the user has the right to view that problem
+            +   #this also consider group based problem policy
                 def can_view_problem?(problem)
                   return true if admin?
                   return available_problems.include? problem
                 end
                 def self.clear_last_login
                   User.update_all(:last_ip => nil)
                 end
                 protected
                   def encrypt_new_password
                     return if password.blank?

app/views/application/_submission.html.haml ¶ +1 -1

               %tr
                 %td{:align => "center"}
                   = submission.number
                 %td.text-right
                   = link_to "##{submission.id}", submission_path(submission.id)
                 %td
                   = l submission.submitted_at, format: :long
                   = "( #{time_ago_in_words(submission.submitted_at)} ago)"
                 %td
                   = submission.source_filename
                   = " (#{submission.language.pretty_name}) "
-            -     = link_to('[load]',{:action => 'source', :id => submission.id})
+            +     = link_to '[load]', download_submission_path(submission)
                 %td
                   - if submission.graded_at
                     = "Graded at #{format_short_time(submission.graded_at)}."
                     %br/
                     = "Score: #{(submission.points*100/submission.problem.full_score).to_i} " if GraderConfiguration['ui.show_score']
                     = " ["
                     %tt
                       = submission.grader_comment
                     = "]"
                 %td
                   = render :partial => 'compiler_message', :locals => {:compiler_message => submission.compiler_message }
                 %td

app/views/graders/list.html.haml ¶ +4 -4

               - content_for :head do
                 <meta http-equiv ="refresh" content="60"/>
               %h1 Grader information
               %p
                 = link_to 'Refresh', { :action => 'list' }, class: 'btn btn-info'
               .panel.panel-primary
                 .panel-heading
                   Grader control:
                 .panel-body
-            -     =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default', method: 'post'
+            +     =link_to 'Start Graders in grading env', { action: 'start_grading'}, class: 'btn btn-default'
-            -     =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default', method: 'post'
+            +     =link_to 'Start Graders in exam env', { action: 'start_exam'}, class: 'btn btn-default'
-            -     =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default', method: 'post'
+            +     =link_to 'Stop all running Graders', { action: 'stop_all'}, class: 'btn btn-default'
-            -     =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default', method: 'post'
+            +     =link_to 'Clear all data', { action: 'clear_all'}, class: 'btn btn-default'
               .row
                 .col-md-6
                   - if @last_task
                     Last task:
                     = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
                     %br/
                   - if @last_test_request
                     Last test_request:
                     = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'

app/views/groups/_form.html.haml ¶ +12 -1

               = form_for @group do |f|
                 - if @group.errors.any?
                   #error_explanation
                     %h2= "#{pluralize(@group.errors.count, "error")} prohibited this group from being saved:"
                     %ul
                       - @group.errors.full_messages.each do |msg|
                         %li= msg
+            +   .row
+            +     .col-md-6
                     .form-group.field
                       = f.label :name
                       = f.text_field :name, class: 'form-control'
+            +   .row
+            +     .col-md-6
                     .form-group.field
                       = f.label :description
                       = f.text_field :description, class: 'form-control'
+            +   .row
+            +     .col-md-6
+            +       .checkbox
+            +         = f.label :enabled do
+            +           = f.check_box :enabled
+            +           Enabled
+            +   .row
+            +     .col-md-6
                     .form-group.actions
                       = f.submit 'Save', class: 'btn btn-primary'

app/views/groups/index.html.haml ¶ +3 -1

               %h1 Groups
               %p
                 = link_to 'New Group', new_group_path, class: 'btn btn-primary'
               %table.table.table-hover
                 %thead
                   %tr
                     %th Name
                     %th Description
+            +       %th Enabled?
                     %th
                     %th
                 %tbody
                   - @groups.each do |group|
-            -       %tr
+            +       %tr{:class => "#{(group.enabled?) ? "success" : "danger"}", id: "group-#{group.id}"}
                       %td= group.name
                       %td= group.description
+            +         %td= toggle_button(group.enabled?, toggle_group_path(group), "group-enabled-#{group.id}", size: ' ', block: ' ')
                       %td= link_to 'View', group, class: 'btn btn-default'
                       %td= link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'
               %br

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

                           / report
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                               %span.caret
                             %ul.dropdown-menu
                               = 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']
                           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog', id: 'user_profile')}".html_safe, 'users', 'profile', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{@current_user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
               /
                 - if (@current_user!=nil) and (session[:admin])
                   %nav.navbar.navbar-fixed-top.navbar-inverse.secondnavbar

app/views/main/help.html.haml ¶ +1 -1

                       %td{:width => '300px'}
                         %tt <tt>/*<br/>LANG: C++<br/>TASK: mobiles<br/>*/</tt>
                   %p
                     =raw t 'help.example_pas'
                   %table{:border => '1'}
                     %tr
                       %td{:width => '300px'}
                         %tt <tt>{<br/>LANG: Pascal<br/>TASK: mobiles<br/>}</tt>
                   %p
-            -       = raw(t('help.ask_questions_at_messages',:message_link_name => (t 'menu.messages'),:url => url_for(:controller => 'messages', :action => 'list')))
+            +       = raw(t('help.ask_questions_at_messages',:message_link_name => (t 'menu.messages'),url: messages_path ))

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

               :css
                 .fix-width {
                   font-family: "Consolas, Monaco, Droid Sans Mono,Mono, Monospace,Courier"
                 }
               %h1 Problem stat: #{@problem.name}
               %h2 Overview
+            + .row
+            +   .col-md-2
+            +     %strong Name:
+            +   .col-md-10
+            +     = @problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
+            +     = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, @problem
+            + .row
+            +   .col-md-2.strong
+            +     %strong Submissions:
+            +   .col-md-10
+            +     = @submissions.count
+            + .row
+            +   .col-md-2.strong
+            +     %strong Solved/Attemped User
+            +   .col-md-10
+            +     #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
-            - %table.info
-            -   %thead
-            -     %tr.info-head
-            -       %th Stat
-            -       %th Value
-            -   %tbody
-            -     %tr{class: cycle('info-even','info-odd')}
-            -       %td Submissions
-            -       %td= @submissions.count
-            -     %tr{class: cycle('info-even','info-odd')}
-            -       %td Solved/Attempted User
-            -       %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
               %h2 Submissions Count
               = render partial: 'application/bar_graph', locals: { histogram: @histogram }
               %h2 Submissions
               - if @submissions and @submissions.count > 0
                 %table#main_table.table.table-condensed.table-striped
                   %thead
                     %tr
                       %th ID
                       %th Login
                       %th Name

app/views/submissions/show.html.haml ¶ +1

                           - if @submission.user
                             = link_to "#{@submission.user.login}", stat_user_path(@submission.user)
                             = @submission.user.full_name
                           - else
                             = "(n/a)"
                       %tr
                         %td.text-right
                           %strong Task
                         %td
                           - if @submission.problem!=nil
                             = link_to "[#{@submission.problem.name}]", stat_problem_path(@submission.problem)
                             = @submission.problem.full_name
+            +               = link_to_description_if_any "[download] <span class='glyphicon glyphicon-file'></span>".html_safe, @submission.problem
                           - else
                             = "(n/a)"
                       %tr
                         %td.text-right
                           %strong Tries
                         %td= @submission.number
                       %tr
                         %td.text-right
                           %strong Language
                         %td= @submission.language.pretty_name
                       %tr
                         %td.text-right

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'

app/views/user_admin/new_list.html.haml ¶ +9

                             %tt passwd, alias
                             and
                             %tt remark
                             is optional.
                           %li
                             When
                             %tt passwd
                             or
                             %tt alias
                             is empty, the original value will be used instead.
                           %li
                             If the users with the same user_id already exists, existing information will be overwritten.
+            +           Example:
+            +           %ol
+            +             %li
+            +               %pre user1,Somchai Jaidee
+            +               will create (or update) a user with login "user1" and setting the fullname to "Somchai Jaidee", also setting a random password.
+            +             %li
+            +               %pre user1,Somchai Jaidee,
+            +               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.
+            +
                 .row
                   .col-md-6
                     = form_tag :action => 'create_from_list' do
                       .form-group
                         = submit_tag 'Create following users',class: 'btn btn-success'
                       .form-group
                         .div.checkbox
                           %label
                             = check_box_tag :add_to_group
                             Also add these users to the following group
                           = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'

config/routes.rb ¶ +9 -9

                     post 'do_import'
                   end
                 end
                 resources :groups do
                   member do
                     post 'add_user', to: 'groups#add_user', as: 'add_user'
                     delete 'remove_user/:user_id', to: 'groups#remove_user', as: 'remove_user'
                     delete 'remove_all_user', to: 'groups#remove_all_user', as: 'remove_all_user'
                     post 'add_problem', to: 'groups#add_problem', as: 'add_problem'
                     delete 'remove_problem/:problem_id', to: 'groups#remove_problem', as: 'remove_problem'
                     delete 'remove_all_problem', to: 'groups#remove_all_problem', as: 'remove_all_problem'
+            +       get 'toggle'
                   end
                   collection do
                   end
                 end
                 resources :testcases, only: [] do
                   member do
                     get 'download_input'
                     get 'download_sol'
                   end
                   collection do
                   end
                   collection do
                     get 'profile'
                     post 'chg_passwd'
                   end
                 end
                 resources :submissions do
                   member do
                     get 'download'
                     get 'compiler_msg'
                     get 'rejudge'
-            -       get 'source'
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'direct_edit_problem/:problem_id(/:user_id)', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
                     get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
                   end
                 end
                 #user admin
                 resources :user_admin  do
                   collection do
                     match 'bulk_manage', via: [:get, :post]
                     get 'bulk_mail'
                     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
                 end
                 resources :contest_management, only: [:index] do
                   collection do
                     get 'user_stat'
                     get 'clear_stat'
                   get 'help'
                   post 'submit'
                 end
                 #main
                 #get "main/list"
                 #get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 #post 'main/submit', to: 'main#submit'
                 #get 'main/announcements', to: 'main#announcements'
                 #
                 get 'tasks/view/:file.:ext' => 'tasks#view'
-            -   get 'tasks/download/:id/:file.:ext' => 'tasks#download'
+            +   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.
                 # Note: This route will make all actions in every controller accessible via GET requests.
                 # match ':controller(/:action(/:id))(.:format)', via:  [:get, :post]
               end

db/seeds.rb ¶ +1

                     desc = conf[:description]
                   else
                     desc = ''
                   end
                   create_configuration_key(conf[:key],
                                            conf[:value_type],
                                            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')
                 problem_admin_right = Right.create(:name=> 'problem_admin',
                                                    :controller => 'problems',
                                                    :action => 'all')
                 graders_right = Right.create(:name => 'graders_admin',
                                              :controller => 'graders',

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

Commit r801:33c0929c92ed public

Author

r801:33c0929c92ed - Mon, 21 Sep 2020 14:13:04 - 23 files changed: 180 inserted, 96 deleted

Commit `r801:33c0929c92ed` public