cafe-grader-web Commit - r879:60919c3675f4

cafe-grader-web

Commit `r879:60919c3675f4` public

parent | child

Description:

tags / problems

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r879:60919c3675f4 - Thu, 06 Oct 2022 04:34:53 - 13 files changed: 87 inserted, 104 deleted

Gemfile.lock ¶ +4

                 specs:
                   simple_form (5.1.0)
                     actionpack (>= 5.2)
                     activemodel (>= 5.2)
               GIT
                 remote: https://github.com/mmotherwell/best_in_place
                 revision: 88eb3052623a9a6cd346864d2aca05021c2f80d0
                 specs:
                   best_in_place (3.1.1)
                     actionpack (>= 3.2)
                     railties (>= 3.2)
               GEM
                 remote: https://rubygems.org/
                 specs:
                   RubyInline (3.12.6)
                     ZenTest (~> 4.3)
                   ZenTest (4.12.1)
                   ace-rails-ap (4.4)
                   actioncable (7.0.4)
                     actionpack (= 7.0.4)
                     activesupport (= 7.0.4)
                     nio4r (~> 2.0)
                     websocket-driver (>= 0.6.1)
                   actionmailbox (7.0.4)
                     actionpack (= 7.0.4)
                     activejob (= 7.0.4)
                     activerecord (= 7.0.4)
                     activestorage (= 7.0.4)
                     activesupport (= 7.0.4)
                     mail (>= 2.7.1)
                     net-imap
                     net-pop
                     net-smtp
                   actionmailer (7.0.4)
                     actionpack (= 7.0.4)
                     actionview (= 7.0.4)
                     activejob (= 7.0.4)
                     activesupport (= 7.0.4)
                     mail (~> 2.5, >= 2.5.4)
                     net-imap
                     net-pop
                     net-smtp
                     rails-dom-testing (~> 2.0)
                   actionpack (7.0.4)
                     actionview (= 7.0.4)
                     activesupport (= 7.0.4)
                     rack (~> 2.0, >= 2.2.0)
                     rack-test (>= 0.6.3)
                     rails-dom-testing (~> 2.0)
                     rails-html-sanitizer (~> 1.0, >= 1.2.0)
                   actiontext (7.0.4)
                     actionpack (= 7.0.4)
                     activerecord (= 7.0.4)
                     activestorage (= 7.0.4)
                     activesupport (= 7.0.4)
                     globalid (>= 0.6.0)
                     nokogiri (>= 1.8.5)
                   actionview (7.0.4)
                     activesupport (= 7.0.4)
                     builder (~> 3.1)
                     erubi (~> 1.4)
                     rails-dom-testing (~> 2.0)
                     rails-html-sanitizer (~> 1.1, >= 1.2.0)
                   activejob (7.0.4)
                     activesupport (= 7.0.4)
                     globalid (>= 0.3.6)
                   activemodel (7.0.4)
                     activesupport (= 7.0.4)
                   activerecord (7.0.4)
                     activemodel (= 7.0.4)
                     activesupport (= 7.0.4)
                   activestorage (7.0.4)
                     actionpack (= 7.0.4)
                     activejob (= 7.0.4)
                     activerecord (= 7.0.4)
                     activesupport (= 7.0.4)
                     marcel (~> 1.0)
                     mini_mime (>= 1.1.0)
                   activesupport (7.0.4)
                     concurrent-ruby (~> 1.0, >= 1.0.2)
                     i18n (>= 1.6, < 2)
                     minitest (>= 5.1)
                     tzinfo (~> 2.0)
                   addressable (2.8.1)
                     public_suffix (>= 2.0.2, < 6.0)
                   ansi (1.5.0)
                   autoprefixer-rails (10.4.7.0)
                     execjs (~> 2)
                   bindex (0.8.1)
                   bootsnap (1.13.0)
                     msgpack (~> 1.2)
                   bootstrap (5.2.1)
                     autoprefixer-rails (>= 9.1.0)
                     popper_js (>= 2.11.6, < 3)
                     sassc-rails (>= 2.0.0)
                   builder (3.2.4)
                   byebug (11.1.3)
                   capybara (3.37.1)
                     addressable
                     matrix
                     mini_mime (>= 0.1.3)
                     nokogiri (~> 1.8)
                     rack (>= 1.6.0)
                     rack-test (>= 0.6.3)
                     regexp_parser (>= 1.5, < 3.0)
                     xpath (~> 3.2)
                   childprocess (4.1.0)
                   coffee-rails (5.0.0)
                     coffee-script (>= 2.2.0)
                     railties (>= 5.2.0)
                   coffee-script (2.4.1)
                     coffee-script-source
                     execjs
                   coffee-script-source (1.12.2)
                   concurrent-ruby (1.1.10)
                   crass (1.0.6)
                   digest (3.1.0)
                   erubi (1.11.0)
                   erubis (2.7.0)
                   execjs (2.8.1)
                   ffi (1.15.5)
                   fuzzy-string-match (1.0.1)
                     RubyInline (>= 3.8.6)
                   globalid (1.0.0)
                     activesupport (>= 5.0)
                   haml (5.2.2)
                     temple (>= 0.8.0)
                     tilt
                   haml-rails (2.0.1)
                     actionpack (>= 5.1)
                     activesupport (>= 5.1)
                     haml (>= 4.0.6, < 6.0)
                     html2haml (>= 1.0.1)
                     railties (>= 5.1)
                   html2haml (2.2.0)
                     erubis (~> 2.7.0)
                     haml (>= 4.0, < 6)
                     nokogiri (>= 1.6.0)
                     ruby_parser (~> 3.5)
                   i18n (1.12.0)
                     concurrent-ruby (~> 1.0)
                   importmap-rails (1.1.5)
                     actionpack (>= 6.0.0)
                     railties (>= 6.0.0)
                   jbuilder (2.11.5)
                     actionview (>= 5.0.0)
                     activesupport (>= 5.0.0)
                   jquery-rails (4.5.0)
                     rails-dom-testing (>= 1, < 3)
                     railties (>= 4.2.0)
                     thor (>= 0.14, < 2.0)
                   listen (3.0.8)
                     rb-fsevent (~> 0.9, >= 0.9.4)
                     rb-inotify (~> 0.9, >= 0.9.7)
                   loofah (2.19.0)
                     crass (~> 1.0.2)
                     nokogiri (>= 1.5.9)
                   mail (2.7.1)
                     mini_mime (>= 0.1.1)
                   marcel (1.0.2)
                   material_icons (2.2.1)
                     railties (>= 3.2)
                   matrix (0.4.2)
                   method_source (1.0.0)
                   mini_mime (1.1.2)
                   minitest (5.16.3)
                   minitest-reporters (1.5.0)
                     ansi
                     builder
                     minitest (>= 5.0)
                     ruby-progressbar
                   momentjs-rails (2.29.4.1)
                     railties (>= 3.1)
                   msgpack (1.5.6)
                   mysql2 (0.5.4)
                   net-imap (0.2.3)
                     digest
                     net-protocol
                     strscan
                   net-pop (0.1.1)
                     digest
                     net-protocol
                     timeout
                   net-protocol (0.1.3)
                     timeout
                   net-smtp (0.3.1)
                     digest
                     net-protocol
                     timeout
                   nio4r (2.5.8)
+            +     nokogiri (1.13.8-x86_64-darwin)
+            +       racc (~> 1.4)
                   nokogiri (1.13.8-x86_64-linux)
                     racc (~> 1.4)
                   popper_js (2.11.6)
                   public_suffix (5.0.0)
                   puma (5.6.5)
                     nio4r (~> 2.0)
                   racc (1.6.0)
                   rack (2.2.4)
                   rack-test (2.0.2)
                     rack (>= 1.3)
                   rails (7.0.4)
                     actioncable (= 7.0.4)
                     actionmailbox (= 7.0.4)
                     actionmailer (= 7.0.4)
                     actionpack (= 7.0.4)
                     actiontext (= 7.0.4)
                     actionview (= 7.0.4)
                     activejob (= 7.0.4)
                     activemodel (= 7.0.4)
                     activerecord (= 7.0.4)
                     activestorage (= 7.0.4)
                     activesupport (= 7.0.4)
                     bundler (>= 1.15.0)
                     railties (= 7.0.4)
                   rails-dom-testing (2.0.3)
                     activesupport (>= 4.2.0)
                     nokogiri (>= 1.6)
                   rails-html-sanitizer (1.4.3)
                     loofah (~> 2.3)
                   railties (7.0.4)
                     actionpack (= 7.0.4)
                     activesupport (= 7.0.4)
                     method_source
                     rake (>= 12.2)
                     thor (~> 1.0)
                     zeitwerk (~> 2.5)
                   rake (13.0.6)
                   rb-fsevent (0.11.2)
                   rb-inotify (0.10.1)
                     ffi (~> 1.0)
                   rdiscount (2.2.0.2)
                   regexp_parser (2.5.0)
                   rexml (3.2.5)
                   rouge (4.0.0)
                   ruby-progressbar (1.11.0)
                   ruby_parser (3.19.1)
                     sexp_processor (~> 4.16)
                   rubyzip (2.3.2)
                   sassc (2.4.0)
                     ffi (~> 1.9)
                   sassc-rails (2.1.2)
                     railties (>= 4.0.0)
                     sassc (>= 2.0)
                     sprockets (> 3.0)
                     sprockets-rails
                     tilt
                   selenium-webdriver (4.4.0)
                     childprocess (>= 0.5, < 5.0)
                     rexml (~> 3.2, >= 3.2.5)
                     rubyzip (>= 1.2.2, < 3.0)
                     websocket (~> 1.0)
                   sexp_processor (4.16.1)
                   spring (2.1.1)
                   spring-watcher-listen (2.0.1)
                     listen (>= 2.7, < 4.0)
                     spring (>= 1.2, < 3.0)
                   sprockets (4.1.1)
                     concurrent-ruby (~> 1.0)
                     rack (> 1, < 3)
                   sprockets-rails (3.4.2)
                     actionpack (>= 5.2)
                     activesupport (>= 5.2)
                     sprockets (>= 3.0.0)
+            +     sqlite3 (1.5.0-x86_64-darwin)
                   sqlite3 (1.5.0-x86_64-linux)
                   strscan (3.0.4)
                   temple (0.8.2)
                   thor (1.2.1)
                   tilt (2.0.11)
                   timeout (0.3.0)
                   tzinfo (2.0.5)
                     concurrent-ruby (~> 1.0)
                   web-console (4.2.0)
                     actionview (>= 6.0.0)
                     activemodel (>= 6.0.0)
                     bindex (>= 0.4.0)
                     railties (>= 6.0.0)
                   webdrivers (5.1.0)
                     nokogiri (~> 1.6)
                     rubyzip (>= 1.3.0)
                     selenium-webdriver (~> 4.0)
                   websocket (1.2.9)
                   websocket-driver (0.7.5)
                     websocket-extensions (>= 0.1.0)
                   websocket-extensions (0.1.5)
                   xpath (3.2.0)
                     nokogiri (~> 1.8)
                   zeitwerk (2.6.0)
               PLATFORMS
+            +   x86_64-darwin-20
                 x86_64-linux
               DEPENDENCIES
                 ace-rails-ap
                 best_in_place!
                 bootsnap
                 bootstrap (~> 5.2)
                 byebug
                 capybara
                 coffee-rails
                 fuzzy-string-match
                 haml
                 haml-rails
                 importmap-rails (~> 1.1)
                 jbuilder
                 jquery-rails
                 listen (>= 3.0.5, < 3.2)
                 mail
                 material_icons
                 minitest-reporters
                 momentjs-rails
                 mysql2
                 puma
                 rails (~> 7.0)
                 rdiscount
                 rouge
                 sassc-rails
                 selenium-webdriver
                 simple_form!
                 spring
                 spring-watcher-listen (~> 2.0.0)
                 sprockets-rails
                 sqlite3
                 web-console (>= 3.3.0)
                 webdrivers
               RUBY VERSION
                  ruby 3.1.2p20
               BUNDLED WITH
 .3.22

app/controllers/application_controller.rb ¶ +6 -19

               require 'ipaddr'
               require "securerandom"
               class ApplicationController < ActionController::Base
                 protect_from_forgery
                 before_action :current_user
                 before_action :nav_announcement
                 before_action :unique_visitor_id
                 before_action :active_controller_action
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
                 MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login'
                 WHITELIST_IGNORE_CONF_KEY = 'right.whitelist_ignore'
                 WHITELIST_IP_CONF_KEY = 'right.whitelist_ip'
                 #report and redirect for unauthorized activities
-            -   def unauthorized_redirect(notice = 'You are not authorized to view the page you requested')
+            +   def unauthorized_redirect(msg = 'You are not authorized to view the page you requested')
-            -     flash[:notice] = notice
+            +     redirect_to login_main_path, alert: msg
-            -     redirect_to login_main_path
                 end
                 # Returns the current logged-in user (if any).
                 def current_user
                   return nil unless session[:user_id]
                   @current_user ||= User.find(session[:user_id])
                 end
                 def nav_announcement
                   @nav_announcement = Announcement.where(on_nav_bar: true)
                 end
                 def active_controller_action
                   #so that we can override this value inside each action
                   @active_controller = controller_name
                   @active_action = action_name
                 end
                 def admin_authorization
                   return false unless check_valid_login
                   user = User.includes(:roles).find(session[:user_id])
                   unless user.admin?
                     unauthorized_redirect
                     return false
                   end
                   return true
                 end
-            -   #admin always count as every roles
+            +   def authorization_by_roles(allowed_roles)
-            -   def role_authorization(roles)
                   return false unless check_valid_login
-            -     user = User.find(session[:user_id])
+            +     return true if @current_user.admin?
-            -     return true if user.admin?
                   roles.each do |r|
-            -       return true if user.has_role?(r)
+            +       return true if @current_user.has_role?(r)
                   end
                   unauthorized_redirect
                 end
-            -   def authorization_by_roles(allowed_roles)
-            -     return false unless check_valid_login
-            -     unless @current_user.roles.detect { |role| allowed_roles.member?(role.name) }
-            -       unauthorized_redirect
-            -       return false
-            -     end
-            -   end
                 def testcase_authorization
                   #admin always has privileged
-            -     if @current_user.admin?
+            +     return true if @current_user.admin?
-            -       return true
-            -     end
                   unauthorized_redirect unless GraderConfiguration["right.view_testcase"]
                 end
                 def unique_visitor_id
                   unless cookies.encrypted[:uuid]
                     value = SecureRandom.uuid
                     cookies.encrypted[:uuid] = { value: value, expires: 20.year }
                   end
                 end
                 protected
                 #redirect to root (and also force logout)
                 #if the user is not logged_in or the system is in "ADMIN ONLY" mode
                 def check_valid_login
                   #check if logged in
                   unless session[:user_id]
                     if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                       unauthorized_redirect('You need to login but you cannot log in at this time')
                     else
                       unauthorized_redirect('You need to login')
                     end
                     return false
                   end
                   # check if run in single user mode
                   if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                     if @current_user==nil || (!@current_user.admin?)
                       unauthorized_redirect('You cannot log in at this time')
                       return false
                     end
                   end
                   # check if the user is enabled
                   unless @current_user.enabled? || @current_user.admin?
                     unauthorized_redirect 'Your account is disabled'
                     return false
                   end
                   # check if user ip is allowed
                   unless @current_user.admin? || GraderConfiguration[WHITELIST_IGNORE_CONF_KEY]
                     unless is_request_ip_allowed?
                       unauthorized_redirect 'Your IP is not allowed to login at this time.'
                       return false
                     end
                   end
                   if GraderConfiguration.multicontests?
                     return true if @current_user.admin?
                     begin
                       if @current_user.contest_stat(true).forced_logout
                         flash[:notice] = 'You have been automatically logged out.'
                         redirect_to :controller => 'main', :action => 'index'
                       end
                     rescue
                     end
                   end
                   return true
                 end
                 #redirect to root (and also force logout)
                 #if the user use different ip from the previous connection
                 #  only applicable when MULTIPLE_IP_LOGIN options is false only
                 def authenticate_by_ip_address
                   #this assume that we have already authenticate normally
                   unless GraderConfiguration[MULTIPLE_IP_LOGIN_CONF_KEY]
                     user = User.find(session[:user_id])
                     if (!user.admin? && user.last_ip && user.last_ip != request.remote_ip)
                       flash[:notice] = "You cannot use the system from #{request.remote_ip}. Your last ip is #{user.last_ip}"
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                     end
                     unless user.last_ip
                       user.last_ip = request.remote_ip
                       user.save
                     end
                   end
                   return true
                 end
                 def authorization
                   return false unless check_valid_login
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role|
                       role.rights.detect{ |right|
                         right.controller == self.class.controller_name and
                           (right.action == 'all' || right.action == action_name)
                       }
                     }
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     #request.env['HTTP_REFERER'] ? (redirect_to :back) : (redirect_to :controller => 'login')
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                 end
                 def verify_time_limit
                   return true if session[:user_id]==nil
                   user = User.find(session[:user_id], :include => :site)
                   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] || ''
                     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
                 def process_query_record(record,
                                          total_count: nil,
                                          select: '',
                                          global_search: [],
                                          no_search: false,
                                          force_order: '',
                                          date_filter: '', date_param_since: 'date_since',date_param_until: 'date_until',
                                          hard_limit: nil)
                   arel_table = record.model.arel_table
                   if !no_search && params['search']
                     global_value = record.model.sanitize_sql(params['search']['value'].strip.downcase)
                     if !global_value.blank?
                       global_value.split.each do |value|
                         global_where = global_search.map{|f| "LOWER(#{f}) like '%#{value}%'"}.join(' OR ')
                         record = record.where(global_where)
                       end
                     end
                     params['columns'].each do |i, col|
                       if !col['search']['value'].blank?
                         record = record.where(arel_table[col['name']].lower.matches("%#{col['search']['value'].strip.downcase}%"))
                       end
                     end
                   end
                   if !date_filter.blank?
                     param_since = params[date_param_since]
                     param_until = params[date_param_until]
                     date_since = Time.zone.parse( param_since ) || Time.new(1,1,1) rescue Time.new(1,1,1)
                     date_until = Time.zone.parse( param_until ) || Time.zone.now() rescue Time.zone.now()
                     date_range = date_since..(date_until.end_of_day)
                     record = record.where(date_filter.to_sym => date_range)
                   end
                   if force_order.blank?
                     if params['order']
                       params['order'].each do |i, o|
                         colName = params['columns'][o['column']]['name']
                         colName = "#{record.model.table_name}.#{colName}" if colName.upcase == 'ID'
                         record = record.order("#{colName} #{o['dir'].casecmp('desc') != 0 ? 'ASC' : 'DESC'}") unless colName.blank?
                       end
                     end
                   else
                     record = record.order(force_order)
                   end
                   filterCount = record.count(record.model.primary_key)
                   # if .group() is used, filterCount might be like {id_1: count_1, id_2: count_2, ...}
                   # so we should count the result again..
                   if filterCount.is_a? Hash
                     filterCount = filterCount.count
                   end
                   record = record.offset(params['start'] || 0)
                   record = record.limit(hard_limit)
                   if (params['length'])
                     limit = params['length'].to_i
                     limit == hard_limit if (hard_limit && hard_limit < limit)
                     record = record.limit(limit)
                   end
                   if (!select.blank?)
                     record = record.select(select)
                   end

app/controllers/login_controller.rb ¶ +4 -6

               class LoginController < ApplicationController
                 @@authenticators = []
                 def index
                   # show login screen
                   reset_session
                   redirect_to :controller => 'main', :action => 'login'
                 end
                 def login
                   user = get_authenticated_user(params[:login], params[:password])
                   unless user
-            -       flash[:notice] = 'Wrong password'
+            +       redirect_to login_main_path, alert: 'Wrong password'
-            -       redirect_to :controller => 'main', :action => 'login'
                     return
                   end
                   if (!GraderConfiguration['right.bypass_agreement']) and (!params[:accept_agree]) and !user.admin?
-            -       flash[:notice] = 'You must accept the agreement before logging in'
+            +       redirect_to login_main_path, alert: 'You must accept the agreement before logging in'
-            -       redirect_to :controller => 'main', :action => 'login'
                     return
                   end
                   #store uuid when login
                   if user.last_ip.nil?
                     user.last_ip = cookies.encrypted[:uuid]
                   else
                     if user.last_ip != cookies.encrypted[:uuid]
                       user.last_ip =cookies.encrypted[:uuid]
                       #log different login
                     end
                   end
                   #process logging in
                   session[:user_id] = user.id
                   session[:admin] = user.admin?
                   # clear forced logout flag for multicontests contest change
                   if GraderConfiguration.multicontests?
                     contest_stat = user.contest_stat
                     if contest_stat.respond_to? :forced_logout
                       if contest_stat.forced_logout
                         contest_stat.forced_logout = false
                         contest_stat.save
                       end
                     end
                   end
                   #save login information
                   Login.create(user_id: user.id, ip_address: cookies.encrypted[:uuid])
                   redirect_to :controller => 'main', :action => 'list'
                 end
                 def site_login
                   begin
                     site = Site.find(params[:login][:site_id])
                   rescue ActiveRecord::RecordNotFound
                     site = nil
                   end
                   if site==nil
-            -       flash[:notice] = 'Wrong site'
+            +       flash[:alert] = 'Wrong site'
                     redirect_to :controller => 'main', :action => 'login'  and return
                   end
                   if (site.password) and (site.password == params[:login][:password])
                     session[:site_id] = site.id
                     redirect_to :controller => 'site', :action => 'index'
                   else
-            -       flash[:notice] = 'Wrong site password'
+            +       flash[:alert] = 'Wrong site password'
                     redirect_to :controller => 'site', :action => 'login'
                   end
                 end
                 def logout
                   redirect_to root_path
                 end
                 def self.add_authenticator(authenticator)
                   @@authenticators << authenticator
                 end
                 protected
                 def get_authenticated_user(login, password)
                   if @@authenticators.empty?
                     return User.authenticate(login, password)
                   else
                     user = User.authenticate(login, password)
                     @@authenticators.each do |authenticator|
                       if not user
                         user = authenticator.authenticate(login, password)
                       end
                     end
                     return user
                   end
                 end
               end

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

               class MainController < ApplicationController
                 before_action :check_valid_login, :except => [:login]
                 before_action :check_viewability, :except => [:index, :login]
                 append_before_action :confirm_and_update_start_time,
                                      :except => [:index,
                                                  :login,
                                                  :confirm_contest_start]
                 # to prevent log in box to be shown when user logged out of the
                 # system only in some tab
                 prepend_before_action :reject_announcement_refresh_when_logged_out,
                                       :only => [:announcements]
                 before_action :authenticate_by_ip_address, :only => [:list]
                 #reset login, clear session
                 #front page
                 def login
-            -     saved_notice = flash[:notice]
+            +     #saved_notice = flash[:notice]
-            -     reset_session
+            +     #flash[:notice] = saved_notice
-            -     flash.now[:notice] = saved_notice
                   @remote_ip = request.remote_ip
                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"
                   # if GraderConfiguration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
                   @announcements = Announcement.frontpage
                   render :action => 'login', locals: {skip_header: true}
                 end
                 def logout
                   reset_session
                   redirect_to root_path
                 end
                 def list
                   prepare_list_information
                 end
                 def help
                   @user = User.find(session[:user_id])
                 end
                 def submit
                   user = User.find(session[:user_id])
                   @submission = Submission.new
                   @submission.problem_id = params[:submission][:problem_id]
                   @submission.user = user
                   @submission.language_id = 0
                   if (params['file']) and (params['file']!='')
                     @submission.source = File.open(params['file'].path,'r:UTF-8',&:read)
                     @submission.source.encode!('UTF-8','UTF-8',invalid: :replace, replace: '')
                     @submission.source_filename = params['file'].original_filename
                   end
                   if (params[:editor_text])
                     language = Language.find_by_id(params[:language_id])
                     @submission.source = params[:editor_text]
                     @submission.source_filename = "live_edit.#{language.ext}"
                     @submission.language = language
                   end
                   @submission.submitted_at = Time.new.gmtime
                   @submission.ip_address = cookies.encrypted[:uuid]
                   if @current_user.admin? == false && GraderConfiguration.time_limit_mode? && @current_user.contest_finished?
                     @submission.errors.add(:base,"The contest is over.")
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?(@current_user)
                     if @submission.save == false
                       flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
                       flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   redirect_to edit_submission_path(@submission)
                 end
                 def source
                   submission = Submission.find(params[:id])
                   if ((submission.user_id == session[:user_id]) and
                       (submission.problem != nil) and
                       (submission.problem.available))
                     send_data(submission.source,
                               {:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def result
                   if !GraderConfiguration.show_grading_result
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   prepare_grading_result(@submission)
                 end
                 def load_output
                   if !GraderConfiguration.show_grading_result or params[:num]==nil
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   case_num = params[:num].to_i
                   out_filename = output_filename(@user.login,
                                                  @submission.problem.name,
                                                  @submission.id,
                                                  case_num)
                   if !FileTest.exists?(out_filename)
                     flash[:notice] = 'Output not found.'
                     redirect_to :action => 'list' and return
                   end
                   if defined?(USE_APACHE_XSENDFILE) and USE_APACHE_XSENDFILE
                     response.headers['Content-Type'] = "application/force-download"
                     response.headers['Content-Disposition'] = "attachment; filename=\"output-#{case_num}.txt\""
                     response.headers["X-Sendfile"] = out_filename
                     response.headers['Content-length'] = File.size(out_filename)
                     render :nothing => true
                   else
                     send_file out_filename, :stream => false, :filename => "output-#{case_num}.txt", :type => "text/plain"
                   end
                 end
                 def error
                   @user = User.find(session[:user_id])
                 end
                 # announcement refreshing and hiding methods
                 def announcements
                   if params.has_key? 'recent'
                     prepare_announcements(params[:recent])
                   else
                     prepare_announcements
                   end
                   render(:partial => 'announcement',
                          :collection => @announcements,
                          :locals => {:announcement_effect => true})
                 end
                 def confirm_contest_start
                   user = User.find(session[:user_id])
                   if request.method == 'POST'
                     user.update_start_time
                     redirect_to :action => 'list'
                   else
                     @contests = user.contests
                     @user = user
                   end
                 end
                 protected
                 def prepare_announcements(recent=nil)
                   if GraderConfiguration.show_tasks_to?(@user)
                     @announcements = Announcement.published(true)
                   else
                     @announcements = Announcement.published
                   end
                   if recent!=nil
                     recent_id = recent.to_i
                     @announcements = @announcements.find_all { |a| a.id > recent_id }
                   end
                 end
                 def prepare_list_information
                   @user = User.find(session[:user_id])
                   if not GraderConfiguration.multicontests?
                     @problems = @user.available_problems
                   else
                     @contest_problems = @user.available_problems_group_by_contests
                     @problems = @user.available_problems
                   end
                   @prob_submissions = {}
                   @problems.each do |p|

app/controllers/submissions_controller.rb ¶ +1 -1

               class SubmissionsController < ApplicationController
                 before_action :set_submission, only: [:show,:download,:compiler_msg,:rejudge,:set_tag, :edit]
                 before_action :check_valid_login
                 before_action :submission_authorization, only: [:show, :download, :edit]
-            -   before_action only: [:rejudge, :set_tag] do role_authorization([:ta]) end
+            +   before_action only: [:rejudge, :set_tag] do authorization_by_roles([:ta]) end
                 # GET /submissions
                 # 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 list_main_path
                       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
                   #log the viewing
                   user = User.find(session[:user_id])
                   SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?
                   @task = @submission.task
                 end
                 def download
                   send_data(@submission.source, {:filename => @submission.download_filename, :type => 'text/plain'})
                 end
                 def compiler_msg
                   respond_to do |format|
                     format.js
                   end
                 end
                 #on-site new submission on specific problem
                 def direct_edit_problem
                   @problem = Problem.find(params[:problem_id])
                   unless @current_user.can_view_problem?(@problem)
                     unauthorized_redirect
                     return
                   end
                   @source = ''
                   if (params[:view_latest])
                     sub = Submission.find_last_by_user_and_problem(@current_user.id,@problem.id)
                     @source = @submission.source.to_s if @submission and @submission.source
                   end
                   render 'edit'
                 end
                 # GET /submissions/1/edit
                 def edit
                   @source = @submission.source.to_s
                   @problem = @submission.problem
                   @lang_id = @submission.language.id
                 end
                 def get_latest_submission_status
                   @problem = Problem.find(params[:pid])
                   @submission = Submission.find_last_by_user_and_problem(params[:uid],params[:pid])
                   respond_to do |format|
                     format.js
                   end
                 end
                 # GET /submissions/:id/rejudge
                 def rejudge
                   @task = @submission.task
                   @task.status_inqueue! if @task
                   respond_to do |format|
                     format.js
                   end
                 end
                 def set_tag
                   @submission.update(tag: params[:tag])
                   redirect_to @submission
                 end
               protected
                 def submission_authorization
                   #admin always has privileged
                   return true if @current_user.admin?
                   return true if @current_user.has_role?('ta') && (['show','download'].include? action_name)
                   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
                 def set_submission
                   @submission = Submission.find(params[:id])
                 end
               end

app/controllers/tags_controller.rb ¶ +1 -1

               class TagsController < ApplicationController
                 before_action :admin_authorization
                 before_action :set_tag, only: [:show, :edit, :update, :destroy]
                 # GET /tags
                 def index
                   @tags = Tag.all
                 end
                 # GET /tags/1
                 def show
                 end
                 # GET /tags/new
                 def new
                   @tag = Tag.new
                 end
                 # GET /tags/1/edit
                 def edit
                 end
                 # POST /tags
                 def create
                   @tag = Tag.new(tag_params)
                   if @tag.save
-            -       redirect_to @tag, notice: 'Tag was successfully created.'
+            +       redirect_to tags_path, notice: 'Tag was successfully created.'
                   else
                     render :new
                   end
                 end
                 # PATCH/PUT /tags/1
                 def update
                   if @tag.update(tag_params)
                     redirect_to @tag, notice: 'Tag was successfully updated.'
                   else
                     render :edit
                   end
                 end
                 # DELETE /tags/1
                 def destroy
                   #remove any association
                   ProblemTag.where(tag_id: @tag.id).destroy_all
                   @tag.destroy
                   redirect_to tags_url, notice: 'Tag was successfully destroyed.'
                 end
                 private
                   # Use callbacks to share common setup or constraints between actions.
                   def set_tag
                     @tag = Tag.find(params[:id])
                   end
                   # Only allow a trusted parameter "white list" through.
                   def tag_params
                     params.require(:tag).permit(:name, :description, :public)
                   end
               end

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

               %h1 Groups
               %p
                 = link_to 'New Group', new_group_path, class: 'btn btn-success'
               %table.table.table-hover
                 %thead
                   %tr
                     %th Name
                     %th Description
                     %th Enabled?
                     %th
                 %tbody
                   - @groups.each do |group|
                     %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}", block: ' ')
                       %td
-            -           = link_to 'Edit members and problems', group, class: 'btn btn-secondary btn-sm'
+            +           = link_to 'Edit members and problems', group, class: 'btn btn-info btn-sm'
                         = link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger btn-sm'
               %br

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

               %header
                 %nav.navbar.fixed-top.navbar-dark.bg-primary.navbar-expand-lg
                   .container-fluid
                     %a.navbar-brand{href: list_main_path}
                       %span.mi.mi-bs home
                       MAIN
                     %button.navbar-toggler.collapsed{ type: :button, 'data-bs': {toggle: 'collapse', target: '#navbar-collapse'} }
                       %span.navbar-toggler-icon
                     .collapse.navbar-collapse#navbar-collapse
                       %ul.navbar-nav.me-auto.mb-2.mb-lg-0
                         / submission
                         - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
                           %li.nav-item.dropdown.mx-2
                             %a.nav-link.dropdown-toggle.active-with-children{href: '#', 'data-bs': {toggle:'dropdown'},  aria: {expanded:"false"}, role: "button"}
                               = "#{I18n.t 'menu.submissions'}"
                             %ul.dropdown-menu
                               %li= link_to 'View', submissions_path, class: 'dropdown-item '+active_class_when(controller: :submissions)
                               %li= link_to 'Self Test', test_index_path, class:'dropdown-item'
                         / hall of fame
                         - if GraderConfiguration['right.user_hall_of_fame']
                           %li= link_to "#{I18n.t 'menu.hall_of_fame'}", problem_hof_report_path, class: 'nav-link mx-2'+active_class_when(controller: :report, action: :problem_hof)
                         / display MODE button (with countdown in contest mode)
                         - if GraderConfiguration.analysis_mode?
                           %div.btn.btn-success#countdown= "ANALYSIS MODE"
                         - elsif GraderConfiguration.time_limit_mode?
                           - if @current_user.contest_finished?
                             %div.btn.btn-danger#countdown= "Contest is over"
                           - elsif !@current_user.contest_started?
                             %div.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
                           - else
                             %div.btn.btn-primary#countdown asdf
                             :javascript
                               $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'});
                         / admin section
                         - if (@current_user!=nil) and (session[:admin])
                           / management
                           %li.nav-item.dropdown.mx-2
                             %a.nav-link.dropdown-toggle.active-with-children{href: '#', 'data-bs': {toggle:'dropdown'}, aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Manage
                             %ul.dropdown-menu
                               %li= link_to 'Announcements', announcements_path, class: 'dropdown-item'+active_class_when(controller: :announcements)
                               %li= link_to 'Problems', problems_path, class: 'dropdown-item'+active_class_when(controller: :problems)
                               %li= link_to 'Tags', tags_path, class: 'dropdown-item'+active_class_when(controller: :tags)
                               %li= link_to 'Users', user_admin_index_path, class: 'dropdown-item'+active_class_when(controller: :user_admin)
                               %li= link_to 'User Groups', groups_path, class: 'dropdown-item'+active_class_when(controller: :groups)
                               %li= link_to 'Graders', graders_list_path, class: 'dropdown-item'+active_class_when(controller: :graders)
                               %li= link_to 'Message ', console_messages_path, class: 'dropdown-item'+active_class_when(controller: :messages)
                               %li
                                 %hr.dropdown-divider
                               %li= link_to 'System config', grader_configuration_index_path, class: 'dropdown-item'+active_class_when(controller: :grader_configuration)
                               %li
                                 %hr.dropdown-divider
                               %li= link_to 'Sites', sites_path, class: 'dropdown-item'+active_class_when(controller: :sites)
                               %li= link_to 'Contests', contest_management_index_path, class: 'dropdown-item'+active_class_when(controller: :contest_management)
                               -#
                           / report
                           %li.nav-item.dropdown.mx-2
                             %a.nav-link.dropdown-toggle.active-with-children{href: '#', 'data-bs': {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               Report
                             %ul.dropdown-menu
                               %li= link_to 'Current Score', current_score_report_path, class: 'dropdown-item'+active_class_when(controller: :report, action: :current_score)
                               %li= link_to 'Score Report', max_score_report_path, class: 'dropdown-item'+active_class_when(controller: :report, action: :max_score)
                               %li= link_to 'Submission Report', submission_report_path, class: 'dropdown-item'+active_class_when(controller: :report, action: :submission)
                               %li= link_to 'Login Report', login_report_path, class: 'dropdown-item'+active_class_when(controller: :report, action: :login)
                           - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0
                             =link_to "#{ungraded} backlogs!",
                               graders_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                         / announcement
                         - @nav_announcement.each do |ann|
                           %p.navbar-text
                             = ann.body.html_safe
                     %ul.navbar-nav
                       %li.nav-item
                         %a.nav-link{href: help_main_path}
                           %span.mi.mi-bs.md-18 help
                       %li.nav-item
                         %a.nav-link{href: messages_path}
                           %span.mi.mi-bs.md-18 chat
                       - if GraderConfiguration['system.user_setting_enabled']
                         %li.nav-item
                           %a.nav-link{href: profile_users_path}
                             %span.mi.mi-bs.md-18 settings
                       %li.nav-item
-            -           %a.nav-link{href: login_main_path}
+            +           %a.nav-link{href: logout_main_path}
                           %span.mi.mi-bs.md-18 exit_to_app
                           = @current_user.full_name
               :javascript
                 $('.active-with-children').each( (index,obj) => {
                   if ($(obj).siblings('.dropdown-menu').has('.active').length > 0) {
                     $(obj).addClass('active')
                   }
                 } )

app/views/main/_login_box.html.haml ¶ +2 -3

               .card
                 .card-body
                   .card-title
                     %h3= GraderConfiguration['ui.front.welcome_message']
                   - if !@hidelogin
                     .card-subtitle=t 'login.message'
                     - if flash[:notice]
-            -         %hr/
+            +         .alert.alert-danger
-            -         %b= flash[:notice]
+            +           = flash[:notice]
-            -         %hr/
                     .card
                       .card-body{ style: "background: #eeeeff;"}
                         = form_with url: login_login_path do |f|
                           .mb-3
                             = f.label :login, "Login", class: 'form-label'
                             = f.text_field :login, class: 'form-control'
                           .mb-3
                             = f.label :password, "Password", class: 'form-label'
                             = f.password_field :password, class: 'form-control'
                           - unless GraderConfiguration['right.bypass_agreement']
                             .col-sm-offset-3.col-sm-9
                               .checkbox
                                 %label
                                   = check_box_tag 'accept_agree'
                                   ยอมรับข้อตกลงการใช้งาน
                           .mb-3
                             .col-sm-offset-3.col-sm-9
                               = submit_tag t('login.login_submit'), class: 'btn btn-primary'
                   - else
                     Login is not possible right now
                   %br/
                   - if GraderConfiguration['system.online_registration']
                     =t 'login.participation'
                     %b
                       = "#{t 'login.please'} "
                       = link_to "#{t 'login.register'}", :controller => :users, :action => :new
                     %br/
                     = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget
               -#
                 %br/
                 - if !@hidelogin
                   =t 'login.message'
                   %br/
                   %br/
                   - if flash[:notice]
                     %hr/
                     %b= flash[:notice]
                     %hr/
                   %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
                     = form_tag login_login_path, {class: 'form-horizontal'} do
                       .form-group
                         =label_tag :login, "Login",class: 'col-sm-3 control-label'
                         .col-sm-9
                           =text_field_tag :login, nil, class: 'form-control'
                       .form-group
                         =label_tag :password, "Password", class: 'col-sm-3 control-label'
                         .col-sm-9
                           =password_field_tag :password, nil, class: 'form-control'
                       - unless GraderConfiguration['right.bypass_agreement']
                         .form-group
                           .col-sm-offset-3.col-sm-9
                             .checkbox
                               %label
                                 = check_box_tag 'accept_agree'
                                 ยอมรับข้อตกลงการใช้งาน
                       .form-group
                         .col-sm-offset-3.col-sm-9
                           = submit_tag t('login.login_submit'), class: 'btn btn-primary'
                 - else
                 %br/
                 - if GraderConfiguration['system.online_registration']
                   =t 'login.participation'
                   %b
                     = "#{t 'login.please'} "
                     = link_to "#{t 'login.register'}", :controller => :users, :action => :new
                   %br/
                   = link_to "#{t 'login.forget_password'}", :controller => :users, :action => :forget

app/views/tags/_form.html.haml ¶ +4 -19

@@ -1,22 +1,7
1	- = form_for @tag do \|f\|	1	+ = simple_form_for @tag do \|f\|
2	- - if @tag.errors.any?
3	- #error_explanation
4	- %h2= "#{pluralize(@tag.errors.count, "error")} prohibited this tag from being saved:"
5	- %ul
6	- - @tag.errors.full_messages.each do \|msg\|
7	- %li= msg
8	-
9	.row	2	.row
10	.col-md-6	3	.col-md-6
11	- .form-group.field	4	+ = f.input :name
12	- = f.label :name	5	+ = f.input :description
13	- = f.text_field :name, class: 'form-control'	6	+ = f.input :public
14	- .form-group.field
15	- = f.label :description
16	- = f.text_area :description, class: 'form-control'
17	- .form-group.field
18	- = f.label :public
19	- = f.text_field :public, class: 'form-control'
20	- .actions
21	= f.submit 'Save', class: 'btn btn-primary'	7	= f.submit 'Save', class: 'btn btn-primary'
22	- .col-md-6

app/views/tags/index.html.haml ¶ +3 -3

               %h1 Tags
               = link_to 'New Tag', new_tag_path, class: 'btn btn-success'
               %table.table.table-hover
                 %thead
                   %tr
                     %th Name
                     %th Description
                     %th Public
                     %th
                     %th
                     %th
                 %tbody
                   - @tags.each do |tag|
                     %tr
                       %td= tag.name
                       %td= tag.description
                       %td= tag.public
-            -         %td= link_to 'Show', tag
+            +         %td= link_to 'Show', tag, class: 'btn btn-info'
-            -         %td= link_to 'Edit', edit_tag_path(tag)
+            +         %td= link_to 'Edit', edit_tag_path(tag), class: 'btn btn-info'
-            -         %td= link_to 'Destroy', tag, :method => :delete, :data => { :confirm => 'Are you sure?' }
+            +         %td= button_to 'Destroy', tag, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'
               %br

app/views/user_admin/index.html.haml ¶ +2 -2

               %h1 Users
               .card.border-success.mb-3
                 .card-header.text-bg-success.border-success
                   Quick Add
                 .card-body
                   = form_with url: user_admin_index_path, scope: :user,  class: 'row row-cols-lg-auto g-3 align-items-center'  do |f|
                     .col-12
                       = f.text_field 'login', :size => 10,class: 'form-control', placeholder: 'login'
                     .form-group
                       = f.text_field 'full_name', :size => 10,class: 'form-control', placeholder: 'full name'
                     .form-group
                       = f.password_field 'password', :size => 10,class: 'form-control', placeholder: 'password'
                     .form-group
                       = f.password_field 'password_confirmation', :size => 10,class: 'form-control', placeholder: 'password confirmation'
                     .form-group
                       = f.text_field 'email', :size => 10,class: 'form-control', placeholder: 'email'
                     =submit_tag "Create", class: 'btn btn-success align-items-bottom'
               .card.border-success.mb-3
                 .card-header.text-bg-success.border-success
                   Import from site management
                 .card-body
                   = form_with url: import_user_admin_index_path, :multipart => true do |f|
                     .row
                       .col-auto
                         = f.label :file, 'File:', class: 'col-form-label'
                       .col-auto
                         = f.file_field :file, class: 'form-control'
                       .col-auto
                         = f.submit 'Submit', class: 'btn btn-secondary'
               %p
                 = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
                 = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
                 = link_to 'Bulk Manage', { action: :bulk_manage} , { class: 'btn btn-secondary btn-info'}
                 = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-secondary '}
                 = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-secondary '}
                 = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-secondary '}
                 = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-secondary '}
               - if GraderConfiguration.multicontests?
                 %br/
                 %b Multi-contest:
                 = link_to '[Manage bulk users in contests]', :action => 'contest_management'
                 View users in:
                 - @contests.each do |contest|
                   = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
                 = link_to "[no contest]", :action => 'contests', :id => 'none'
               %table.table.table-hover.table-condense.datatable
                 %thead
                   %th Login
                   %th Full name
                   %th email
                   %th Remark
                   %th
                     Activated
                     %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'User has already confirmed the email?' } [?]
                   %th
                     Enabled
                     %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'Allow the user to login?' } [?]
                   %th Last IP
                   %th
                   %th
                   %th
                   %th
                 - for user in @users
                   %tr
                     %td= link_to user.login, stat_user_path(user)
                     %td= user.full_name
                     %td= user.email
                     %td= user.remark
                     %td= toggle_button(user.activated?, toggle_activate_user_path(user),"toggle_activate_user_#{user.id}")
                     %td= toggle_button(user.enabled?, toggle_enable_user_path(user),"toggle_enable_user_#{user.id}")
                     %td= user.last_ip
                     %td= link_to 'Clear IP', {:action => 'clear_last_ip', :id => user, :page=>params[:page]}, :confirm => 'This will reset last logging in ip of the user, are you sure?', class: 'btn btn-secondary btn-sm btn-block'
-            -       %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-secondary btn-sm btn-block'
+            +       %td= link_to 'Show', {:action => 'show', :id => user}, class: 'btn btn-info btn-sm btn-block'
-            -       %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-secondary btn-sm btn-block'
+            +       %td= link_to 'Edit', {:action => 'edit', :id => user}, class: 'btn btn-info btn-sm btn-block'
                     %td= link_to 'Destroy', {action: :destroy, id: user}, data: {confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-danger btn-sm btn-block'
               %br/
               = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
               = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
               :javascript
                 $(document).on('import-map-loaded',(e) => {
                   $('.datatable').DataTable({
                     'pageLength': 50
                   });
                 })

db/schema.rb ¶ +56 -45

               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record to
               # incrementally modify your database, and then regenerate this schema definition.
               #
               # This file is the source Rails uses to define your schema when running `bin/rails
               # db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
               # be faster and is potentially less error prone than running all of your
               # migrations from scratch. Old migrations may fail to apply correctly if those
               # migrations use external dependencies or application code.
               #
               # It's strongly recommended that you check this file into your version control system.
               ActiveRecord::Schema[7.0].define(version: 2022_09_27_074644) do
-            -   create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+            +   create_table "active_storage_attachments", charset: "latin1", force: :cascade do |t|
                   t.string "name", null: false
                   t.string "record_type", null: false
                   t.bigint "record_id", null: false
                   t.bigint "blob_id", null: false
                   t.datetime "created_at", null: false
                   t.index ["blob_id"], name: "index_active_storage_attachments_on_blob_id"
                   t.index ["record_type", "record_id", "name", "blob_id"], name: "index_active_storage_attachments_uniqueness", unique: true
                 end
-            -   create_table "active_storage_blobs", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+            +   create_table "active_storage_blobs", charset: "latin1", force: :cascade do |t|
                   t.string "key", null: false
                   t.string "filename", null: false
                   t.string "content_type"
                   t.text "metadata"
                   t.string "service_name", null: false
                   t.bigint "byte_size", null: false
                   t.string "checksum"
                   t.datetime "created_at", null: false
                   t.index ["key"], name: "index_active_storage_blobs_on_key", unique: true
                 end
-            -   create_table "active_storage_variant_records", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
+            +   create_table "active_storage_variant_records", charset: "latin1", force: :cascade do |t|
                   t.bigint "blob_id", null: false
                   t.string "variation_digest", null: false
                   t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
                 end
-            -   create_table "announcements", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "announcements", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.string "author"
-            -     t.text "body"
+            +     t.text "body", size: :medium
                   t.boolean "published"
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                   t.boolean "frontpage", default: false
                   t.boolean "contest_only", default: false
                   t.string "title"
                   t.string "notes"
                   t.boolean "on_nav_bar", default: false
                 end
-            -   create_table "contests", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "contests", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.string "title"
                   t.boolean "enabled"
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                   t.string "name"
                 end
-            -   create_table "contests_problems", id: false, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "contests_problems", id: false, charset: "utf8", force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"
                 end
-            -   create_table "contests_users", id: false, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "contests_users", id: false, charset: "utf8", force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "user_id"
                 end
-            -   create_table "countries", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "countries", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.string "name"
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                 end
-            -   create_table "descriptions", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "descriptions", id: :integer, charset: "utf8", force: :cascade do |t|
-            -     t.text "body"
+            +     t.text "body", size: :medium
                   t.boolean "markdowned"
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                 end
-            -   create_table "grader_configurations", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "grader_configurations", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.string "key"
                   t.string "value_type"
                   t.string "value"
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
-            -     t.text "description"
+            +     t.text "description", size: :medium
                 end
-            -   create_table "grader_processes", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "grader_processes", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.string "host"
                   t.integer "pid"
                   t.string "mode"
                   t.boolean "active"
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                   t.integer "task_id"
                   t.string "task_type"
                   t.boolean "terminated"
                   t.index ["host", "pid"], name: "index_grader_processes_on_ip_and_pid"
                 end
                 create_table "groups", id: :integer, charset: "latin1", force: :cascade do |t|
                   t.string "name"
                   t.string "description"
                   t.boolean "enabled", default: true
                 end
                 create_table "groups_problems", id: false, charset: "latin1", force: :cascade do |t|
                   t.integer "problem_id", null: false
                   t.integer "group_id", null: false
                   t.index ["group_id", "problem_id"], name: "index_groups_problems_on_group_id_and_problem_id"
                 end
                 create_table "groups_users", charset: "latin1", force: :cascade do |t|
                   t.integer "group_id", null: false
                   t.integer "user_id", null: false
                   t.index ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id"
                 end
-            -   create_table "heart_beats", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "heart_beats", id: :integer, charset: "latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.string "ip_address"
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                   t.string "status"
                   t.index ["updated_at"], name: "index_heart_beats_on_updated_at"
                 end
-            -   create_table "languages", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "languages", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.string "name", limit: 10
                   t.string "pretty_name"
                   t.string "ext", limit: 10
                   t.string "common_ext"
                 end
-            -   create_table "logins", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "logins", id: :integer, charset: "latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.string "ip_address"
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                   t.index ["user_id"], name: "index_logins_on_user_id"
                 end
-            -   create_table "messages", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "messages", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.integer "sender_id"
                   t.integer "receiver_id"
                   t.integer "replying_message_id"
-            -     t.text "body"
+            +     t.text "body", size: :medium
                   t.boolean "replied"
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                 end
-            -   create_table "problems", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "problems", id: :bigint, default: nil, charset: "utf8", force: :cascade do |t|
-            -     t.string "name", limit: 30
+            +     t.string "name", limit: 100
                   t.string "full_name"
                   t.integer "full_score"
                   t.date "date_added"
                   t.boolean "available"
                   t.string "url"
                   t.integer "description_id"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                   t.string "description_filename"
                   t.boolean "view_testcase"
                   t.integer "difficulty"
                   t.text "description"
                   t.boolean "markdown"
                 end
-            -   create_table "problems_tags", id: :integer, charset: "latin1", force: :cascade do |t|
+            +   create_table "problems_tags", id: :bigint, default: nil, charset: "latin1", force: :cascade do |t|
-            -     t.integer "problem_id"
+            +     t.bigint "problem_id"
                   t.integer "tag_id"
                   t.index ["problem_id", "tag_id"], name: "index_problems_tags_on_problem_id_and_tag_id", unique: true
                   t.index ["problem_id"], name: "index_problems_tags_on_problem_id"
                   t.index ["tag_id"], name: "index_problems_tags_on_tag_id"
                 end
-            -   create_table "rights", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "rights", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
-            -   create_table "rights_roles", id: false, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "rights_roles", id: false, charset: "utf8", force: :cascade do |t|
                   t.integer "right_id"
                   t.integer "role_id"
                   t.index ["role_id"], name: "index_rights_roles_on_role_id"
                 end
-            -   create_table "roles", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "roles", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.string "name"
                 end
-            -   create_table "roles_users", id: false, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "roles_users", id: false, charset: "utf8", force: :cascade do |t|
                   t.integer "role_id"
                   t.integer "user_id"
                   t.index ["user_id"], name: "index_roles_users_on_user_id"
                 end
-            -   create_table "sessions", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "sessions", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.string "session_id"
-            -     t.text "data"
+            +     t.text "data", size: :medium
                   t.datetime "updated_at", precision: nil
                   t.index ["session_id"], name: "index_sessions_on_session_id"
                   t.index ["updated_at"], name: "index_sessions_on_updated_at"
                 end
-            -   create_table "sites", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "sites", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.string "name"
                   t.boolean "started"
                   t.datetime "start_time", precision: nil
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                   t.integer "country_id"
                   t.string "password"
                 end
-            -   create_table "submission_view_logs", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "solutions", charset: "latin1", force: :cascade do |t|
+            +     t.string "solution"
+            +     t.bigint "problem_id"
+            +     t.bigint "submission_id"
+            +     t.integer "type"
+            +     t.index ["problem_id"], name: "index_solutions_on_problem_id"
+            +     t.index ["submission_id"], name: "index_solutions_on_submission_id"
+            +   end
+            +
+            +   create_table "submission_view_logs", id: :integer, charset: "latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.integer "submission_id"
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                 end
-            -   create_table "submissions", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "submissions", id: :bigint, default: nil, charset: "utf8", force: :cascade do |t|
                   t.integer "user_id"
                   t.integer "problem_id"
                   t.integer "language_id"
                   t.text "source", size: :medium
                   t.binary "binary"
                   t.datetime "submitted_at", precision: nil
                   t.datetime "compiled_at", precision: nil
-            -     t.text "compiler_message"
+            +     t.text "compiler_message", size: :medium
                   t.datetime "graded_at", precision: nil
                   t.integer "points"
-            -     t.text "grader_comment"
+            +     t.text "grader_comment", size: :medium
                   t.integer "number"
                   t.string "source_filename"
                   t.float "max_runtime"
                   t.integer "peak_memory"
                   t.integer "effective_code_length"
                   t.string "ip_address"
                   t.integer "tag", default: 0
                   t.index ["submitted_at"], name: "index_submissions_on_submitted_at"
                   t.index ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true
                   t.index ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id"
                 end
                 create_table "tags", id: :integer, charset: "latin1", force: :cascade do |t|
                   t.string "name", null: false
                   t.text "description"
                   t.boolean "public"
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                 end
-            -   create_table "tasks", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "tasks", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.integer "submission_id"
                   t.datetime "created_at", precision: nil
                   t.integer "status"
                   t.datetime "updated_at", precision: nil
                   t.index ["status"], name: "index_tasks_on_status"
                   t.index ["submission_id"], name: "index_tasks_on_submission_id"
                 end
-            -   create_table "test_pairs", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "test_pairs", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.integer "problem_id"
-            -     t.text "input", size: :medium
+            +     t.text "input", size: :long
-            -     t.text "solution", size: :medium
+            +     t.text "solution", size: :long
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                 end
-            -   create_table "test_requests", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "test_requests", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.integer "user_id"
                   t.integer "problem_id"
                   t.integer "submission_id"
                   t.string "input_file_name"
                   t.string "output_file_name"
                   t.string "running_stat"
                   t.integer "status"
                   t.datetime "updated_at", precision: nil, null: false
                   t.datetime "submitted_at", precision: nil
                   t.datetime "compiled_at", precision: nil
-            -     t.text "compiler_message"
+            +     t.text "compiler_message", size: :medium
                   t.datetime "graded_at", precision: nil
                   t.string "grader_comment"
                   t.datetime "created_at", precision: nil, null: false
                   t.float "running_time"
                   t.string "exit_status"
                   t.integer "memory_usage"
                   t.index ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id"
                 end
                 create_table "testcases", id: :integer, charset: "latin1", force: :cascade do |t|
                   t.integer "problem_id"
                   t.integer "num"
                   t.integer "group"
                   t.integer "score"
                   t.text "input", size: :long
                   t.text "sol", size: :long
-            -     t.datetime "created_at", precision: nil
+            +     t.datetime "created_at", precision: nil, null: false
-            -     t.datetime "updated_at", precision: nil
+            +     t.datetime "updated_at", precision: nil, null: false
                   t.index ["problem_id"], name: "index_testcases_on_problem_id"
                 end
-            -   create_table "user_contest_stats", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "user_contest_stats", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.integer "user_id"
                   t.datetime "started_at", precision: nil
                   t.datetime "created_at", precision: nil, null: false
                   t.datetime "updated_at", precision: nil, null: false
                   t.boolean "forced_logout"
                 end
-            -   create_table "users", id: :integer, charset: "utf8mb3", collation: "utf8mb3_unicode_ci", force: :cascade do |t|
+            +   create_table "users", id: :integer, charset: "utf8", force: :cascade do |t|
                   t.string "login", limit: 50
                   t.string "full_name"
                   t.string "hashed_password"
                   t.string "salt", limit: 5
                   t.string "alias"
                   t.string "email"
                   t.integer "site_id"
                   t.integer "country_id"
                   t.boolean "activated", default: false
                   t.datetime "created_at", precision: nil
                   t.datetime "updated_at", precision: nil
+            +     t.string "section"
                   t.boolean "enabled", default: true
                   t.string "remark"
                   t.string "last_ip"
-            -     t.string "section"
                   t.integer "default_language"
                   t.index ["login"], name: "index_users_on_login", unique: true
                 end
                 add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
                 add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
                 add_foreign_key "problems_tags", "problems"
                 add_foreign_key "problems_tags", "tags"
+            +   add_foreign_key "solutions", "problems"
+            +   add_foreign_key "solutions", "submissions"
               end

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 r879:60919c3675f4 public

Author

r879:60919c3675f4 - Thu, 06 Oct 2022 04:34:53 - 13 files changed: 87 inserted, 104 deleted

Commit `r879:60919c3675f4` public