cafe-grader-web Commit - r787:6a311ff47066

cafe-grader-web

Commit `r787:6a311ff47066` public

parent | child

Description:

merge with algo-bm

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

r787:6a311ff47066 - Mon, 04 Nov 2019 10:08:23 - 13 files changed: 81 inserted, 75 deleted

app/controllers/application_controller.rb ¶ +9 -9

                 protect_from_forgery
                 before_action :current_user
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
                 MULTIPLE_IP_LOGIN_CONF_KEY = 'right.multiple_ip_login'
-            -   ALLOW_WHITELIST_IP_ONLY_CONF_KEY = 'right.allow_whitelist_ip_only'
+            +   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')
                   flash[:notice] = notice
                   redirect_to login_main_path
                   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[ALLOW_WHITELIST_IP_ONLY_CONF_KEY]
+            +     unless @current_user.admin? || GraderConfiguration[WHITELIST_IGNORE_CONF_KEY]
                     unless is_request_ip_allowed?
-            -         unauthorized_redirect 'Your IP is not 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?
                 #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])
-            -       puts "User admin #{user.admin?}"
                     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}"
-            -         puts "hahaha"
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                     end
                     unless user.last_ip
                       user.last_ip = request.remote_ip
                       user.save
                     return false
                   end
                   return true
                 end
                 def is_request_ip_allowed?
-            -     if GraderConfiguration[ALLOW_WHITELIST_IP_ONLY_CONF_KEY]
+            +     unless GraderConfiguration[WHITELIST_IGNORE_CONF_KEY]
                     user_ip = IPAddr.new(request.remote_ip)
-            -       GraderConfiguration[WHITELIST_IP_LIST_CONF_KEY].delete(' ').split(',').each do |ips|
+            +       GraderConfiguration[WHITELIST_IP_CONF_KEY].delete(' ').split(',').each do |ips|
                       allow_ips = IPAddr.new(ips)
-            -         unless allow_ips.includes(user_ip)
+            +         if allow_ips.include?(user_ip)
-            -           return false
+            +           return true
                       end
                     end
+            +       return false
                   end
                   return true
                 end
               end

app/controllers/main_controller.rb ¶ +1

                 #reset login, clear session
                 #front page
                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   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}"

app/controllers/report_controller.rb ¶ +1

                 end
                 protected
                 def calculate_max_score(problems, users,since_id,until_id, get_last_score = false)
+            +     #scorearray[i] = user #i's user stat where i is the index (not id)
                   scorearray = Array.new
                   users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     problems.each do |p|
                       unless get_last_score

app/controllers/submissions_controller.rb ¶ -3

                 end
                 def get_latest_submission_status
                   @problem = Problem.find(params[:pid])
                   @submission = Submission.find_last_by_user_and_problem(params[:uid],params[:pid])
-            -     puts User.find(params[:uid]).login
-            -     puts Problem.find(params[:pid]).name
-            -     puts 'nil' unless @submission
                   respond_to do |format|
                     format.js
                   end
                 end
                 # GET /submissions/:id/rejudge

app/controllers/user_admin_controller.rb ¶ +15 -11

                 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(',')
                     if items.length>=2
                       login = items[0]
                       added_random_password = false
                       if items.length >= 3 and items[2].chomp(" ").length > 0;
                         password = items[2].chomp(" ")
                       else
                         password = random_password
-            -           add_random_password=true;
+            +           added_random_password=true;
                       end
                       if items.length>= 4 and items[3].chomp(" ").length > 0;
                         user_alias = items[3].chomp(" ")
                       else
                         user_alias = login
                       if (user)
                         user.full_name = full_name
                         user.password = password
                         user.remark = remark
                       else
                         user = User.new({:login => login,
-            -                             :full_name => full_name,
+            +                            :full_name => full_name,
-            -                             :password => password,
+            +                            :password => password,
-            -                             :password_confirmation => password,
+            +                            :password_confirmation => password,
-            -                             :alias => user_alias,
+            +                            :alias => user_alias,
-            -                             :remark => remark})
+            +                            :remark => remark})
                       end
                       user.activated = true
                       if user.save
                         if added_random_password
                           note << "'#{login}' (+)"
                         else
                           note << login
                         end
                         ok_user << user
                       else
-            -           error_note << "#{login}"
+            +           error_note << "'#{login}'"
+            +           error_msg = user.errors.full_messages.to_sentence unless error_msg
                       end
                     end
                   end
                   #add to group
                     if group
                       group.users << ok_user
                     end
                   end
                   # show flash
-            -     flash[:success] = 'User(s) ' + note.join(', ') +
+            +     if note.size > 0
-            -       ' were successfully created.  ' +
+            +       flash[:success] = 'User(s) ' + note.join(', ') +
-            -       '( (+) - created with random passwords.)'
+            +         ' were successfully created.  ' +
+            +         '( (+) - created with random passwords.)'
+            +     end
                   if error_note.size > 0
-            -       flash[:error] = "Following user(s) failed to be created: " + error_note.join(', ')
+            +       flash[:error] = "Following user(s) failed to be created: " + error_note.join(', ') + ". The error of the first failed one are: " + error_msg;
                   end
                   redirect_to :action => 'index'
                 end
                 def edit
                   @user = User.find(params[:id])

app/views/groups/show.html.haml ¶ +6 -4

                         .panel-title Users in this group
                       .panel-body
                         %ul
                           %li
                             If you want to add several users to a group, it may be easier to just re-import those users in
                             = link_to 'New list of users', new_list_user_admin_index_path
-            -               page
+            +               page. You can also use
+            +               = link_to 'Bulk Manage User', bulk_manage_user_admin_index_path
+            +               page.
                         =form_tag add_user_group_path(@group), class: 'form-inline' do
                           .form-group
                             =label_tag :user_id, "User"
-            -               =select_tag :user_id, options_from_collection_for_select(User.all,'id','full_name'), class: 'select2'
+            +               =select_tag :user_id, options_from_collection_for_select(User.all,'id','full_name'), class: 'select2', style: 'width: 10em';
                           =submit_tag "Add",class: 'btn btn-primary'
                         %table.table.table-hover
                           %thead
                             %tr
                       .panel-heading
                         .panel-title Problems
                       .panel-body
                         %ul
                           %li
                             If you want to add several problem to a group, it may be easier to bulk manage them in the
-            -               = link_to 'Bulk Manage', manage_problems_path
+            +               = link_to 'Bulk Manage Problems', manage_problems_path
                             page
                         =form_tag add_problem_group_path(@group), class: 'form-inline' do
                           .form-group
                             =label_tag :problem_id, "Problem"
-            -               =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','full_name'), class: 'select2'
+            +               =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','full_name'), class: 'select2', style: 'width: 10em';
                           =submit_tag "Add",class: 'btn btn-primary'
                         %table.table.table-hover
                           %thead
                             %tr

app/views/main/login.html.haml ¶ +1

                     .announcementbox{:style => 'margin-top: 0px'}
                       %span{:class => 'title'}
                         Announcements
                       = render :partial => 'announcement', :collection => @announcements
                 .col-md-4{style: "padding-left: 20px;"}
                   = render :partial => 'login_box'
+            +     = "current ip is #{@remote_ip}"

app/views/report/_score_table.html.haml ¶ +3 -3

                     %th Remark
                     - @problems.each do |p|
                       %th.text-right= p.name.gsub('_',' ')
                     %th.text-right Total
                     %th.text-right Passed
                 %tbody
-            -     - sum = Array.new(@scorearray[0].count,0)
+            +     - sum = Array.new(@problems.count+1,0)
-            -     - nonzero = Array.new(@scorearray[0].count,0)
+            +     - nonzero = Array.new(@problems.count+1,0)
-            -     - full = Array.new(@scorearray[0].count,0)
+            +     - full = Array.new(@problems.count+1,0)
                   - @scorearray.each do |sc|
                     %tr
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - if i == 0
                           %td= link_to sc[i].login, stat_user_path(sc[i])

app/views/report/current_score.html.haml ¶ +1 -1

               .container-fluid
                 %h1 Current Score
                 = form_tag current_score_report_path, method: 'get' do
                   Show only users from this group
-            -     = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
+            +     = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_id]), id: 'group_name',class: 'select2', style: 'width: 20em';
                   = submit_tag 'Apply',class: 'btn btn-default'
                 %br
                 = render "score_table"

config/routes.rb ¶ -1

                   get 'login'
                   get 'multiple_login'
                   get 'problem_hof(/:id)', action: 'problem_hof', as: 'problem_hof'
                   get 'current_score(/:group_id)', action: 'current_score', as: 'current_score'
                   get 'max_score'
                   post 'show_max_score'
-            -     get 'problem_hof(/:id)', action: 'problem_hof', as: 'problem_hof'
                   get 'stuck'
                   get 'cheat_report'
                   post 'cheat_report'
                   get 'cheat_scruntinize'
                   post 'cheat_scruntinize'
                 end

db/schema.rb ¶ +37 -36

               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended that you check this file into your version control system.
               ActiveRecord::Schema.define(version: 2018_06_12_102327) do
-            -   create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "author"
                   t.text "body"
                   t.boolean "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.boolean "frontpage", default: false
                   t.boolean "contest_only", default: false
                   t.string "title"
                   t.string "notes"
                 end
-            -   create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "title"
                   t.boolean "enabled"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.string "name"
                 end
-            -   create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"
                 end
-            -   create_table "contests_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "contests_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "user_id"
                 end
-            -   create_table "countries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "countries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "name"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
-            -   create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.text "body"
                   t.boolean "markdowned"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
-            -   create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "key"
                   t.string "value_type"
                   t.string "value"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.text "description"
                 end
-            -   create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "host"
                   t.integer "pid"
                   t.string "mode"
                   t.boolean "active"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer "task_id"
                   t.string "task_type"
                   t.boolean "terminated"
-            -     t.index ["host", "pid"], name: "index_grader_processes_on_ip_and_pid"
+            +     t.index ["host", "pid"], name: "index_grader_processes_on_host_and_pid"
                 end
-            -   create_table "groups", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
+            +   create_table "groups", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "name"
                   t.string "description"
                 end
-            -   create_table "groups_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
+            +   create_table "groups_problems", id: false, options: "ENGINE=InnoDB DEFAULT 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", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
+            +   create_table "groups_users", id: false, options: "ENGINE=InnoDB DEFAULT 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, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.string "ip_address"
-            -     t.datetime "created_at", null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at", null: false
+            +     t.datetime "updated_at"
                   t.string "status"
                   t.index ["updated_at"], name: "index_heart_beats_on_updated_at"
                 end
-            -   create_table "languages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "languages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", 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, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.string "ip_address"
-            -     t.datetime "created_at", null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at", null: false
+            +     t.datetime "updated_at"
                 end
-            -   create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "sender_id"
                   t.integer "receiver_id"
                   t.integer "replying_message_id"
                   t.text "body"
                   t.boolean "replied"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
-            -   create_table "problems", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "problems", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "name", limit: 30
                   t.string "full_name"
                   t.integer "full_score"
                   t.date "date_added"
                   t.boolean "available"
                   t.string "url"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                   t.string "description_filename"
                   t.boolean "view_testcase"
                 end
-            -   create_table "problems_tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
+            +   create_table "problems_tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "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, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "rights", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
-            -   create_table "rights_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "rights_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", 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, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "roles", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "name"
                 end
-            -   create_table "roles_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "roles_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", 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, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "sessions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "session_id"
                   t.text "data"
                   t.datetime "updated_at"
                   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, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "sites", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "name"
                   t.boolean "started"
                   t.datetime "start_time"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer "country_id"
                   t.string "password"
                 end
                 create_table "submission_view_logs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.integer "submission_id"
-            -     t.datetime "created_at", null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at", null: false
+            +     t.datetime "updated_at"
                 end
-            -   create_table "submissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "submissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.integer "problem_id"
                   t.integer "language_id"
                   t.text "source", limit: 16777215
                   t.binary "binary"
                   t.datetime "submitted_at"
                   t.integer "effective_code_length"
                   t.string "ip_address"
                   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, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
+            +   create_table "tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.string "name", null: false
                   t.text "description"
                   t.boolean "public"
                   t.datetime "created_at", null: false
                   t.datetime "updated_at", null: false
                 end
-            -   create_table "tasks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "tasks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "submission_id"
                   t.datetime "created_at"
                   t.integer "status"
                   t.datetime "updated_at"
                   t.index ["submission_id"], name: "index_tasks_on_submission_id"
                 end
-            -   create_table "test_pairs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "test_pairs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "problem_id"
                   t.text "input", limit: 16777215
                   t.text "solution", limit: 16777215
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
-            -   create_table "test_requests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "test_requests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", 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.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, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
+            +   create_table "testcases", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "problem_id"
                   t.integer "num"
                   t.integer "group"
                   t.integer "score"
                   t.text "input", limit: 4294967295
                   t.text "sol", limit: 4294967295
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.index ["problem_id"], name: "index_testcases_on_problem_id"
                 end
-            -   create_table "user_contest_stats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "user_contest_stats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
                   t.integer "user_id"
                   t.datetime "started_at"
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.boolean "forced_logout"
                 end
-            -   create_table "users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
+            +   create_table "users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", 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"

db/seeds.rb ¶ +6 -6

                  },
                  {
                    :key => 'right.view_testcase',
                    :value_type => 'boolean',
                    :default_value => 'false',
-            -      :description => 'When true, any user can view/download test data'
+            +      :description => 'If true, any user can view/download test data'
                  },
                  {
                    :key => 'system.online_registration',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :default_value => 'false',
                    :description => "If true, available problem to the user will be only ones associated with the group of the user."
                  },
                  {
-            -      :key => 'right.whitelist_ip_only',
+            +      :key => 'right.whitelist_ignore',
                    :value_type => 'boolean',
-            -      :default_value => 'false',
+            +      :default_value => 'true',
-            -      :description => "If true, non-admin user will be able to use the system only when their ip is in the 'whitelist_ip'."
+            +      :description => "If true, no IP check against whitelist_ip is perform. However, when false, non-admin user must have their ip in 'whitelist_ip' to be able to login."
                  },
                  {
                    :key => 'right.whitelist_ip',
                    :value_type => 'string',
                    :default_value => '0.0.0.0/0',
-            -      :description => "list of whitelist ip, given in comma separated CIDR notation. For example '161.200.92.0/23, 161.200.80.1/32'"
+            +      :description => "list of whitelist ip, given in comma separated CIDR notation. For example '192.168.90.0/23, 192.168.1.23/32'"
                  },
                 ]
               def create_configuration_key(key,
               def seed_users_and_roles
                 seed_roles
                 seed_root
               end
               def seed_more_languages
-            -   Language.delete_all
+            +   #Language.delete_all
                 Language.find_or_create_by( name: 'c', pretty_name: 'C', ext: 'c', common_ext: 'c' )
                 Language.find_or_create_by( name: 'cpp', pretty_name: 'C++', ext: 'cpp', common_ext: 'cpp,cc' )
                 Language.find_or_create_by( name: 'pas', pretty_name: 'Pascal', ext: 'pas', common_ext: 'pas' )
                 Language.find_or_create_by( name: 'ruby', pretty_name: 'Ruby', ext: 'rb', common_ext: 'rb' )
                 Language.find_or_create_by( name: 'python', pretty_name: 'Python', ext: 'py', common_ext: 'py' )
                 Language.find_or_create_by( name: 'java', pretty_name: 'Java', ext: 'java', common_ext: 'java' )

test/system/users_test.rb ¶ +1 -1

                     click_on 'Manage'
                     click_on 'Users', match: :first
                   end
                   click_on 'New list of users', match: :first
                   find(:css, 'textarea').fill_in with:"abc1,Boaty McBoatface,abcdef,alias1,remark1,\nabc2,Boaty2 McSecond,acbdef123,aias2,remark2"
-            -     click_on 'create users'
+            +     click_on 'Create following users'
                   assert_text('remark1')
                   assert_text('remark2')
                 end
                 test "grant admin right" do

Write
Preview

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

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

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

Sign in to your account

Author

r787:6a311ff47066 - Mon, 04 Nov 2019 10:08:23 - 13 files changed: 81 inserted, 75 deleted

Sign in to your account

Commit r787:6a311ff47066 public

Author

r787:6a311ff47066 - Mon, 04 Nov 2019 10:08:23 - 13 files changed: 81 inserted, 75 deleted

Commit `r787:6a311ff47066` public