cafe-grader-web

Commit r754:4cbf294c126c public

parent | child
Description:
- more test on user admin and authorization - fix more routing
Commit status:
[Not Reviewed]
References:
algo
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r754:4cbf294c126c - - 8 files changed: 140 inserted, 79 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -39,25 +39,29
39 Login.create(user_id: user.id, ip_address: request.remote_ip)
39 Login.create(user_id: user.id, ip_address: request.remote_ip)
40
40
41 redirect_to :controller => 'main', :action => 'list'
41 redirect_to :controller => 'main', :action => 'list'
42 end
42 end
43
43
44 def site_login
44 def site_login
45 begin
45 begin
46 site = Site.find(params[:login][:site_id])
46 site = Site.find(params[:login][:site_id])
47 rescue ActiveRecord::RecordNotFound
47 rescue ActiveRecord::RecordNotFound
48 site = nil
48 site = nil
49 end
49 end
50 if site==nil
50 if site==nil
51 flash[:notice] = 'Wrong site'
51 flash[:notice] = 'Wrong site'
52 redirect_to :controller => 'main', :action => 'login' and return
52 redirect_to :controller => 'main', :action => 'login' and return
53 end
53 end
54 if (site.password) and (site.password == params[:login][:password])
54 if (site.password) and (site.password == params[:login][:password])
55 session[:site_id] = site.id
55 session[:site_id] = site.id
56 redirect_to :controller => 'site', :action => 'index'
56 redirect_to :controller => 'site', :action => 'index'
57 else
57 else
58 flash[:notice] = 'Wrong site password'
58 flash[:notice] = 'Wrong site password'
59 redirect_to :controller => 'site', :action => 'login'
59 redirect_to :controller => 'site', :action => 'login'
60 end
60 end
61 end
61 end
62
62
63 + def logout
64 + redirect_to root_path
63 end
65 end
66 +
67 + end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,66 +1,72
1 class MainController < ApplicationController
1 class MainController < ApplicationController
2
2
3 before_action :authenticate, :except => [:index, :login]
3 before_action :authenticate, :except => [:index, :login]
4 before_action :check_viewability, :except => [:index, :login]
4 before_action :check_viewability, :except => [:index, :login]
5
5
6 append_before_action :confirm_and_update_start_time,
6 append_before_action :confirm_and_update_start_time,
7 :except => [:index,
7 :except => [:index,
8 :login,
8 :login,
9 :confirm_contest_start]
9 :confirm_contest_start]
10
10
11 # to prevent log in box to be shown when user logged out of the
11 # to prevent log in box to be shown when user logged out of the
12 # system only in some tab
12 # system only in some tab
13 prepend_before_action :reject_announcement_refresh_when_logged_out,
13 prepend_before_action :reject_announcement_refresh_when_logged_out,
14 :only => [:announcements]
14 :only => [:announcements]
15
15
16 before_action :authenticate_by_ip_address, :only => [:list]
16 before_action :authenticate_by_ip_address, :only => [:list]
17
17
18 # NOTE: This method is not actually needed, 'config/routes.rb' has
18 # NOTE: This method is not actually needed, 'config/routes.rb' has
19 # assigned action login as a default action.
19 # assigned action login as a default action.
20 def index
20 def index
21 redirect_to :action => 'login'
21 redirect_to :action => 'login'
22 end
22 end
23
23
24 + #reset login, clear session
24 def login
25 def login
25 saved_notice = flash[:notice]
26 saved_notice = flash[:notice]
26 reset_session
27 reset_session
27 flash.now[:notice] = saved_notice
28 flash.now[:notice] = saved_notice
28
29
29 # EXPERIMENT:
30 # EXPERIMENT:
30 # Hide login if in single user mode and the url does not
31 # Hide login if in single user mode and the url does not
31 # explicitly specify /login
32 # explicitly specify /login
32 #
33 #
33 # logger.info "PATH: #{request.path}"
34 # logger.info "PATH: #{request.path}"
34 # if GraderConfiguration['system.single_user_mode'] and
35 # if GraderConfiguration['system.single_user_mode'] and
35 # request.path!='/main/login'
36 # request.path!='/main/login'
36 # @hidelogin = true
37 # @hidelogin = true
37 # end
38 # end
38
39
39 @announcements = Announcement.frontpage
40 @announcements = Announcement.frontpage
40 render :action => 'login', :layout => 'empty'
41 render :action => 'login', :layout => 'empty'
41 end
42 end
42
43
44 + def logout
45 + reset_session
46 + redirect_to root_path
47 + end
48 +
43 def list
49 def list
44 prepare_list_information
50 prepare_list_information
45 end
51 end
46
52
47 def help
53 def help
48 @user = User.find(session[:user_id])
54 @user = User.find(session[:user_id])
49 end
55 end
50
56
51 def submit
57 def submit
52 user = User.find(session[:user_id])
58 user = User.find(session[:user_id])
53
59
54 @submission = Submission.new
60 @submission = Submission.new
55 @submission.problem_id = params[:submission][:problem_id]
61 @submission.problem_id = params[:submission][:problem_id]
56 @submission.user = user
62 @submission.user = user
57 @submission.language_id = 0
63 @submission.language_id = 0
58 if (params['file']) and (params['file']!='')
64 if (params['file']) and (params['file']!='')
59 @submission.source = File.open(params['file'].path,'r:UTF-8',&:read)
65 @submission.source = File.open(params['file'].path,'r:UTF-8',&:read)
60 @submission.source.encode!('UTF-8','UTF-8',invalid: :replace, replace: '')
66 @submission.source.encode!('UTF-8','UTF-8',invalid: :replace, replace: '')
61 @submission.source_filename = params['file'].original_filename
67 @submission.source_filename = params['file'].original_filename
62 end
68 end
63
69
64 if (params[:editor_text])
70 if (params[:editor_text])
65 language = Language.find_by_id(params[:language_id])
71 language = Language.find_by_id(params[:language_id])
66 @submission.source = params[:editor_text]
72 @submission.source = params[:editor_text]
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,29 +1,29
1
1
2 - if submission.nil?
2 - if submission.nil?
3 = "-"
3 = "-"
4 - else
4 - else
5 - unless submission.graded_at
5 - unless submission.graded_at
6 = t 'main.submitted_at'
6 = t 'main.submitted_at'
7 = format_short_time(submission.submitted_at.localtime)
7 = format_short_time(submission.submitted_at.localtime)
8 - else
8 - else
9 %strong= t 'main.graded_at'
9 %strong= t 'main.graded_at'
10 = "#{format_short_time(submission.graded_at.localtime)} "
10 = "#{format_short_time(submission.graded_at.localtime)} "
11 %br
11 %br
12 - if GraderConfiguration['ui.show_score']
12 - if GraderConfiguration['ui.show_score']
13 %strong=t 'main.score'
13 %strong=t 'main.score'
14 = "#{(submission.points*100/submission.problem.full_score).to_i} "
14 = "#{(submission.points*100/submission.problem.full_score).to_i} "
15 = " ["
15 = " ["
16 %tt.grader-comment
16 %tt.grader-comment
17 = submission.grader_comment
17 = submission.grader_comment
18 = "]"
18 = "]"
19 %br
19 %br
20 %strong View:
20 %strong View:
21 - if GraderConfiguration.show_grading_result
21 - if GraderConfiguration.show_grading_result
22 = link_to '[detailed result]', :action => 'result', :id => submission.id
22 = link_to '[detailed result]', :action => 'result', :id => submission.id
23 /= link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'}
23 /= link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'}
24 - = link_to "#{t 'main.cmp_msg'}", compiler_msg_submission_path(submission.id), {popup: true,remote: true,class: 'btn btn-xs btn-info'}
24 + = link_to "#{t 'main.cmp_msg'}", compiler_msg_submission_path(submission), {popup: true,remote: true,class: 'btn btn-xs btn-info'}
25 - = link_to "#{t 'main.src_link'}",{:action => 'source', :id => submission.id}, class: 'btn btn-xs btn-info'
25 + = link_to "#{t 'main.src_link'}",download_submission_path(submission), class: 'btn btn-xs btn-info'
26 = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'
26 = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'
27 - if GraderConfiguration.show_testcase
27 - if GraderConfiguration.show_testcase
28 = link_to "testcases", show_problem_testcases_path(problem_id), class: 'btn btn-xs btn-info'
28 = link_to "testcases", show_problem_testcases_path(problem_id), class: 'btn btn-xs btn-info'
29
29
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,25 +1,25
1 %h1 Administrators
1 %h1 Administrators
2
2
3 %table{:class => 'info'}
3 %table{:class => 'info'}
4 %tr{:class => 'info-head'}
4 %tr{:class => 'info-head'}
5 %th #
5 %th #
6 %th Login
6 %th Login
7 %th Full name
7 %th Full name
8 %th
8 %th
9 - @admins.each_with_index do |user, i|
9 - @admins.each_with_index do |user, i|
10 %tr
10 %tr
11 %td= i+1
11 %td= i+1
12 %td= user.login
12 %td= user.login
13 %td= user.full_name
13 %td= user.full_name
14 %td
14 %td
15 - if user.login!='root'
15 - if user.login!='root'
16 = link_to '[revoke]', :action => 'revoke_admin', :id => user.id
16 = link_to '[revoke]', :action => 'revoke_admin', :id => user.id
17 %hr
17 %hr
18
18
19 = form_tag :action => 'grant_admin' do
19 = form_tag :action => 'grant_admin' do
20 - Grant admin permission to:
20 + = label_tag :login, 'Grant admin permission to:'
21 - = text_field_tag 'login'
21 + = text_field_tag 'login',nil, class: 'input-field'
22 - = submit_tag 'Grant'
22 + = submit_tag 'Grant', class: 'btn btn-primary'
23
23
24 %hr/
24 %hr/
25 = link_to '[go back to index]', :action => 'index'
25 = link_to '[go back to index]', :action => 'index'
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,38 +1,35
1 Rails.application.routes.draw do
1 Rails.application.routes.draw do
2 resources :tags
2 resources :tags
3 get "sources/direct_edit"
3 get "sources/direct_edit"
4
4
5 root :to => 'main#login'
5 root :to => 'main#login'
6
6
7 #logins
7 #logins
8 match 'login/login', to: 'login#login', via: [:get,:post]
8 match 'login/login', to: 'login#login', via: [:get,:post]
9
9
10 -
11 resources :contests
10 resources :contests
12 -
13 resources :sites
11 resources :sites
14 -
15 resources :test
12 resources :test
16
13
17 resources :messages do
14 resources :messages do
18 collection do
15 collection do
19 get 'console'
16 get 'console'
20 end
17 end
21 end
18 end
22
19
23 resources :announcements do
20 resources :announcements do
24 member do
21 member do
25 get 'toggle','toggle_front'
22 get 'toggle','toggle_front'
26 end
23 end
27 end
24 end
28
25
29 resources :problems do
26 resources :problems do
30 member do
27 member do
31 get 'toggle'
28 get 'toggle'
32 get 'toggle_test'
29 get 'toggle_test'
33 get 'toggle_view_testcase'
30 get 'toggle_view_testcase'
34 get 'stat'
31 get 'stat'
35 end
32 end
36 collection do
33 collection do
37 get 'turn_all_off'
34 get 'turn_all_off'
38 get 'turn_all_on'
35 get 'turn_all_on'
@@ -82,93 +79,96
82 get 'download'
79 get 'download'
83 get 'compiler_msg'
80 get 'compiler_msg'
84 get 'rejudge'
81 get 'rejudge'
85 get 'source'
82 get 'source'
86 end
83 end
87 collection do
84 collection do
88 get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
85 get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
89 get 'direct_edit_problem/:problem_id(/:user_id)', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
86 get 'direct_edit_problem/:problem_id(/:user_id)', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
90 get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
87 get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
91 end
88 end
92 end
89 end
93
90
94
91
95 #user admin
92 #user admin
96 resources :user_admin do
93 resources :user_admin do
97 collection do
94 collection do
98 match 'bulk_manage', via: [:get, :post]
95 match 'bulk_manage', via: [:get, :post]
99 get 'bulk_mail'
96 get 'bulk_mail'
100 get 'user_stat'
97 get 'user_stat'
101 get 'import'
98 get 'import'
102 get 'new_list'
99 get 'new_list'
103 get 'admin'
100 get 'admin'
104 get 'active'
101 get 'active'
105 get 'mass_mailing'
102 get 'mass_mailing'
103 + get 'revoke_admin'
106 post 'grant_admin'
104 post 'grant_admin'
107 match 'create_from_list', via: [:get, :post]
105 match 'create_from_list', via: [:get, :post]
108 match 'random_all_passwords', via: [:get, :post]
106 match 'random_all_passwords', via: [:get, :post]
109 end
107 end
110 member do
108 member do
111 get 'clear_last_ip'
109 get 'clear_last_ip'
112 end
110 end
113 end
111 end
114
112
115 resources :contest_management, only: [:index] do
113 resources :contest_management, only: [:index] do
116 collection do
114 collection do
117 get 'user_stat'
115 get 'user_stat'
118 get 'clear_stat'
116 get 'clear_stat'
119 get 'clear_all_stat'
117 get 'clear_all_stat'
120 get 'change_contest_mode'
118 get 'change_contest_mode'
121 end
119 end
122 end
120 end
123
121
124 #get 'user_admin', to: 'user_admin#index'
122 #get 'user_admin', to: 'user_admin#index'
125 #get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
123 #get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
126 #post 'user_admin', to: 'user_admin#create'
124 #post 'user_admin', to: 'user_admin#create'
127 #delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
125 #delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
128
126
129 #singular resource
127 #singular resource
130 #---- BEWARE ---- singular resource maps to plural controller by default, we can override by provide controller name directly
128 #---- BEWARE ---- singular resource maps to plural controller by default, we can override by provide controller name directly
131 #report
129 #report
132 resource :report, only: [], controller: 'report' do
130 resource :report, only: [], controller: 'report' do
133 get 'login'
131 get 'login'
134 get 'multiple_login'
132 get 'multiple_login'
135 get 'problem_hof/:id', action: 'problem_hof'
133 get 'problem_hof/:id', action: 'problem_hof'
136 get 'current_score'
134 get 'current_score'
137 get 'max_score'
135 get 'max_score'
138 post 'show_max_score'
136 post 'show_max_score'
139 end
137 end
140 #get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
138 #get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
141 #get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
139 #get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
142 #get "report/login"
140 #get "report/login"
143 #get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
141 #get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
144 #post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
142 #post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
145
143
146 resource :main, only: [], controller: 'main' do
144 resource :main, only: [], controller: 'main' do
145 + get 'login'
146 + get 'logout'
147 get 'list'
147 get 'list'
148 get 'submission(/:id)', action: 'submission', as: 'main_submission'
148 get 'submission(/:id)', action: 'submission', as: 'main_submission'
149 - post 'submit'
150 get 'announcements'
149 get 'announcements'
151 get 'help'
150 get 'help'
151 + post 'submit'
152 end
152 end
153 #main
153 #main
154 #get "main/list"
154 #get "main/list"
155 #get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
155 #get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
156 #post 'main/submit', to: 'main#submit'
156 #post 'main/submit', to: 'main#submit'
157 #get 'main/announcements', to: 'main#announcements'
157 #get 'main/announcements', to: 'main#announcements'
158
158
159
159
160 #
160 #
161 get 'tasks/view/:file.:ext' => 'tasks#view'
161 get 'tasks/view/:file.:ext' => 'tasks#view'
162 get 'tasks/download/:id/:file.:ext' => 'tasks#download'
162 get 'tasks/download/:id/:file.:ext' => 'tasks#download'
163 get 'heartbeat/:id/edit' => 'heartbeat#edit'
163 get 'heartbeat/:id/edit' => 'heartbeat#edit'
164
164
165 #grader
165 #grader
166 get 'graders/list', to: 'graders#list', as: 'grader_list'
166 get 'graders/list', to: 'graders#list', as: 'grader_list'
167
167
168
168
169 # See how all your routes lay out with "rake routes"
169 # See how all your routes lay out with "rake routes"
170
170
171 # This is a legacy wild controller route that's not recommended for RESTful applications.
171 # This is a legacy wild controller route that's not recommended for RESTful applications.
172 # Note: This route will make all actions in every controller accessible via GET requests.
172 # Note: This route will make all actions in every controller accessible via GET requests.
173 # match ':controller(/:action(/:id))(.:format)', via: [:get, :post]
173 # match ':controller(/:action(/:id))(.:format)', via: [:get, :post]
174 end
174 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,5 +1,5
1 - class ChangeSubmissionSourceSize < ActiveRecord::Migration
1 + class ChangeSubmissionSourceSize < ActiveRecord::Migration[4.2]
2 def change
2 def change
3 change_column :submissions, :source, :text, :limit => 1.megabyte
3 change_column :submissions, :source, :text, :limit => 1.megabyte
4 end
4 end
5 end
5 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,307 +1,306
1 # This file is auto-generated from the current state of the database. Instead
1 # This file is auto-generated from the current state of the database. Instead
2 # of editing this file, please use the migrations feature of Active Record to
2 # of editing this file, please use the migrations feature of Active Record to
3 # incrementally modify your database, and then regenerate this schema definition.
3 # incrementally modify your database, and then regenerate this schema definition.
4 #
4 #
5 # Note that this schema.rb definition is the authoritative source for your
5 # Note that this schema.rb definition is the authoritative source for your
6 # database schema. If you need to create the application database on another
6 # database schema. If you need to create the application database on another
7 # system, you should be using db:schema:load, not running all the migrations
7 # system, you should be using db:schema:load, not running all the migrations
8 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
8 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
9 # you'll amass, the slower it'll run and the greater likelihood for issues).
9 # you'll amass, the slower it'll run and the greater likelihood for issues).
10 #
10 #
11 # It's strongly recommended that you check this file into your version control system.
11 # It's strongly recommended that you check this file into your version control system.
12
12
13 - ActiveRecord::Schema.define(version: 20180612102327) do
13 + ActiveRecord::Schema.define(version: 2018_06_12_102327) do
14
14
15 - create_table "announcements", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
15 + create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
16 t.string "author"
16 t.string "author"
17 - t.text "body", limit: 65535
17 + t.text "body"
18 t.boolean "published"
18 t.boolean "published"
19 t.datetime "created_at"
19 t.datetime "created_at"
20 t.datetime "updated_at"
20 t.datetime "updated_at"
21 t.boolean "frontpage", default: false
21 t.boolean "frontpage", default: false
22 t.boolean "contest_only", default: false
22 t.boolean "contest_only", default: false
23 t.string "title"
23 t.string "title"
24 t.string "notes"
24 t.string "notes"
25 end
25 end
26
26
27 - create_table "contests", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
27 + create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
28 t.string "title"
28 t.string "title"
29 t.boolean "enabled"
29 t.boolean "enabled"
30 t.datetime "created_at"
30 t.datetime "created_at"
31 t.datetime "updated_at"
31 t.datetime "updated_at"
32 t.string "name"
32 t.string "name"
33 end
33 end
34
34
35 - create_table "contests_problems", id: false, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
35 + create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
36 t.integer "contest_id"
36 t.integer "contest_id"
37 t.integer "problem_id"
37 t.integer "problem_id"
38 end
38 end
39
39
40 - create_table "contests_users", id: false, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
40 + create_table "contests_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
41 t.integer "contest_id"
41 t.integer "contest_id"
42 t.integer "user_id"
42 t.integer "user_id"
43 end
43 end
44
44
45 - create_table "countries", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
45 + create_table "countries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
46 t.string "name"
46 t.string "name"
47 t.datetime "created_at"
47 t.datetime "created_at"
48 t.datetime "updated_at"
48 t.datetime "updated_at"
49 end
49 end
50
50
51 - create_table "descriptions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
51 + create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
52 - t.text "body", limit: 65535
52 + t.text "body"
53 t.boolean "markdowned"
53 t.boolean "markdowned"
54 t.datetime "created_at"
54 t.datetime "created_at"
55 t.datetime "updated_at"
55 t.datetime "updated_at"
56 end
56 end
57
57
58 - create_table "grader_configurations", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
58 + create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
59 t.string "key"
59 t.string "key"
60 t.string "value_type"
60 t.string "value_type"
61 t.string "value"
61 t.string "value"
62 t.datetime "created_at"
62 t.datetime "created_at"
63 t.datetime "updated_at"
63 t.datetime "updated_at"
64 - t.text "description", limit: 65535
64 + t.text "description"
65 end
65 end
66
66
67 - create_table "grader_processes", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
67 + create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
68 t.string "host"
68 t.string "host"
69 t.integer "pid"
69 t.integer "pid"
70 t.string "mode"
70 t.string "mode"
71 t.boolean "active"
71 t.boolean "active"
72 t.datetime "created_at"
72 t.datetime "created_at"
73 t.datetime "updated_at"
73 t.datetime "updated_at"
74 t.integer "task_id"
74 t.integer "task_id"
75 t.string "task_type"
75 t.string "task_type"
76 t.boolean "terminated"
76 t.boolean "terminated"
77 - t.index ["host", "pid"], name: "index_grader_processes_on_host_and_pid", using: :btree
77 + t.index ["host", "pid"], name: "index_grader_processes_on_ip_and_pid"
78 end
78 end
79
79
80 - create_table "groups", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
80 + create_table "groups", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
81 t.string "name"
81 t.string "name"
82 t.string "description"
82 t.string "description"
83 end
83 end
84
84
85 - create_table "groups_problems", id: false, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
85 + create_table "groups_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
86 t.integer "problem_id", null: false
86 t.integer "problem_id", null: false
87 t.integer "group_id", null: false
87 t.integer "group_id", null: false
88 - t.index ["group_id", "problem_id"], name: "index_groups_problems_on_group_id_and_problem_id", using: :btree
88 + t.index ["group_id", "problem_id"], name: "index_groups_problems_on_group_id_and_problem_id"
89 end
89 end
90
90
91 - create_table "groups_users", id: false, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
91 + create_table "groups_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
92 t.integer "group_id", null: false
92 t.integer "group_id", null: false
93 t.integer "user_id", null: false
93 t.integer "user_id", null: false
94 - t.index ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id", using: :btree
94 + t.index ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id"
95 end
95 end
96
96
97 - create_table "heart_beats", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
97 + create_table "heart_beats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
98 t.integer "user_id"
98 t.integer "user_id"
99 t.string "ip_address"
99 t.string "ip_address"
100 - t.datetime "created_at"
100 + t.datetime "created_at", null: false
101 - t.datetime "updated_at"
101 + t.datetime "updated_at", null: false
102 t.string "status"
102 t.string "status"
103 - t.index ["updated_at"], name: "index_heart_beats_on_updated_at", using: :btree
103 + t.index ["updated_at"], name: "index_heart_beats_on_updated_at"
104 end
104 end
105
105
106 - create_table "languages", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
106 + create_table "languages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
107 t.string "name", limit: 10
107 t.string "name", limit: 10
108 t.string "pretty_name"
108 t.string "pretty_name"
109 t.string "ext", limit: 10
109 t.string "ext", limit: 10
110 t.string "common_ext"
110 t.string "common_ext"
111 end
111 end
112
112
113 - create_table "logins", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
113 + create_table "logins", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
114 t.integer "user_id"
114 t.integer "user_id"
115 t.string "ip_address"
115 t.string "ip_address"
116 - t.datetime "created_at"
116 + t.datetime "created_at", null: false
117 - t.datetime "updated_at"
117 + t.datetime "updated_at", null: false
118 end
118 end
119
119
120 - create_table "messages", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
120 + create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
121 t.integer "sender_id"
121 t.integer "sender_id"
122 t.integer "receiver_id"
122 t.integer "receiver_id"
123 t.integer "replying_message_id"
123 t.integer "replying_message_id"
124 - t.text "body", limit: 65535
124 + t.text "body"
125 t.boolean "replied"
125 t.boolean "replied"
126 t.datetime "created_at"
126 t.datetime "created_at"
127 t.datetime "updated_at"
127 t.datetime "updated_at"
128 end
128 end
129
129
130 - create_table "problems", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
130 + create_table "problems", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
131 t.string "name", limit: 30
131 t.string "name", limit: 30
132 t.string "full_name"
132 t.string "full_name"
133 t.integer "full_score"
133 t.integer "full_score"
134 t.date "date_added"
134 t.date "date_added"
135 t.boolean "available"
135 t.boolean "available"
136 t.string "url"
136 t.string "url"
137 t.integer "description_id"
137 t.integer "description_id"
138 t.boolean "test_allowed"
138 t.boolean "test_allowed"
139 t.boolean "output_only"
139 t.boolean "output_only"
140 t.string "description_filename"
140 t.string "description_filename"
141 t.boolean "view_testcase"
141 t.boolean "view_testcase"
142 end
142 end
143
143
144 - create_table "problems_tags", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
144 + create_table "problems_tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
145 t.integer "problem_id"
145 t.integer "problem_id"
146 t.integer "tag_id"
146 t.integer "tag_id"
147 - t.index ["problem_id", "tag_id"], name: "index_problems_tags_on_problem_id_and_tag_id", unique: true, using: :btree
147 + t.index ["problem_id", "tag_id"], name: "index_problems_tags_on_problem_id_and_tag_id", unique: true
148 - t.index ["problem_id"], name: "index_problems_tags_on_problem_id", using: :btree
148 + t.index ["problem_id"], name: "index_problems_tags_on_problem_id"
149 - t.index ["tag_id"], name: "index_problems_tags_on_tag_id", using: :btree
149 + t.index ["tag_id"], name: "index_problems_tags_on_tag_id"
150 end
150 end
151
151
152 - create_table "rights", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
152 + create_table "rights", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
153 t.string "name"
153 t.string "name"
154 t.string "controller"
154 t.string "controller"
155 t.string "action"
155 t.string "action"
156 end
156 end
157
157
158 - create_table "rights_roles", id: false, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
158 + create_table "rights_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
159 t.integer "right_id"
159 t.integer "right_id"
160 t.integer "role_id"
160 t.integer "role_id"
161 - t.index ["role_id"], name: "index_rights_roles_on_role_id", using: :btree
161 + t.index ["role_id"], name: "index_rights_roles_on_role_id"
162 end
162 end
163
163
164 - create_table "roles", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
164 + create_table "roles", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
165 t.string "name"
165 t.string "name"
166 end
166 end
167
167
168 - create_table "roles_users", id: false, force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
168 + create_table "roles_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
169 t.integer "role_id"
169 t.integer "role_id"
170 t.integer "user_id"
170 t.integer "user_id"
171 - t.index ["user_id"], name: "index_roles_users_on_user_id", using: :btree
171 + t.index ["user_id"], name: "index_roles_users_on_user_id"
172 end
172 end
173
173
174 - create_table "sessions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
174 + create_table "sessions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
175 t.string "session_id"
175 t.string "session_id"
176 - t.text "data", limit: 65535
176 + t.text "data"
177 t.datetime "updated_at"
177 t.datetime "updated_at"
178 - t.index ["session_id"], name: "index_sessions_on_session_id", using: :btree
178 + t.index ["session_id"], name: "index_sessions_on_session_id"
179 - t.index ["updated_at"], name: "index_sessions_on_updated_at", using: :btree
179 + t.index ["updated_at"], name: "index_sessions_on_updated_at"
180 end
180 end
181
181
182 - create_table "sites", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
182 + create_table "sites", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
183 t.string "name"
183 t.string "name"
184 t.boolean "started"
184 t.boolean "started"
185 t.datetime "start_time"
185 t.datetime "start_time"
186 t.datetime "created_at"
186 t.datetime "created_at"
187 t.datetime "updated_at"
187 t.datetime "updated_at"
188 t.integer "country_id"
188 t.integer "country_id"
189 t.string "password"
189 t.string "password"
190 end
190 end
191
191
192 - create_table "submission_view_logs", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
192 + create_table "submission_view_logs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
193 t.integer "user_id"
193 t.integer "user_id"
194 t.integer "submission_id"
194 t.integer "submission_id"
195 - t.datetime "created_at"
195 + t.datetime "created_at", null: false
196 - t.datetime "updated_at"
196 + t.datetime "updated_at", null: false
197 end
197 end
198
198
199 - create_table "submissions", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
199 + create_table "submissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
200 t.integer "user_id"
200 t.integer "user_id"
201 t.integer "problem_id"
201 t.integer "problem_id"
202 t.integer "language_id"
202 t.integer "language_id"
203 t.text "source", limit: 16777215
203 t.text "source", limit: 16777215
204 - t.binary "binary", limit: 65535
204 + t.binary "binary"
205 t.datetime "submitted_at"
205 t.datetime "submitted_at"
206 t.datetime "compiled_at"
206 t.datetime "compiled_at"
207 - t.text "compiler_message", limit: 65535
207 + t.text "compiler_message"
208 t.datetime "graded_at"
208 t.datetime "graded_at"
209 t.integer "points"
209 t.integer "points"
210 - t.text "grader_comment", limit: 65535
210 + t.text "grader_comment"
211 t.integer "number"
211 t.integer "number"
212 t.string "source_filename"
212 t.string "source_filename"
213 - t.float "max_runtime", limit: 24
213 + t.float "max_runtime"
214 t.integer "peak_memory"
214 t.integer "peak_memory"
215 t.integer "effective_code_length"
215 t.integer "effective_code_length"
216 t.string "ip_address"
216 t.string "ip_address"
217 - t.index ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true, using: :btree
217 + t.index ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true
218 - t.index ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id", using: :btree
218 + t.index ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id"
219 end
219 end
220
220
221 - create_table "tags", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
221 + create_table "tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
222 t.string "name", null: false
222 t.string "name", null: false
223 - t.text "description", limit: 65535
223 + t.text "description"
224 t.boolean "public"
224 t.boolean "public"
225 t.datetime "created_at", null: false
225 t.datetime "created_at", null: false
226 t.datetime "updated_at", null: false
226 t.datetime "updated_at", null: false
227 end
227 end
228
228
229 - create_table "tasks", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
229 + create_table "tasks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
230 t.integer "submission_id"
230 t.integer "submission_id"
231 t.datetime "created_at"
231 t.datetime "created_at"
232 t.integer "status"
232 t.integer "status"
233 t.datetime "updated_at"
233 t.datetime "updated_at"
234 - t.index ["submission_id"], name: "index_tasks_on_submission_id", using: :btree
234 + t.index ["submission_id"], name: "index_tasks_on_submission_id"
235 end
235 end
236
236
237 - create_table "test_pairs", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
237 + create_table "test_pairs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
238 t.integer "problem_id"
238 t.integer "problem_id"
239 t.text "input", limit: 16777215
239 t.text "input", limit: 16777215
240 t.text "solution", limit: 16777215
240 t.text "solution", limit: 16777215
241 t.datetime "created_at"
241 t.datetime "created_at"
242 t.datetime "updated_at"
242 t.datetime "updated_at"
243 end
243 end
244
244
245 - create_table "test_requests", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
245 + create_table "test_requests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
246 t.integer "user_id"
246 t.integer "user_id"
247 t.integer "problem_id"
247 t.integer "problem_id"
248 t.integer "submission_id"
248 t.integer "submission_id"
249 t.string "input_file_name"
249 t.string "input_file_name"
250 t.string "output_file_name"
250 t.string "output_file_name"
251 t.string "running_stat"
251 t.string "running_stat"
252 t.integer "status"
252 t.integer "status"
253 t.datetime "updated_at"
253 t.datetime "updated_at"
254 t.datetime "submitted_at"
254 t.datetime "submitted_at"
255 t.datetime "compiled_at"
255 t.datetime "compiled_at"
256 - t.text "compiler_message", limit: 65535
256 + t.text "compiler_message"
257 t.datetime "graded_at"
257 t.datetime "graded_at"
258 t.string "grader_comment"
258 t.string "grader_comment"
259 t.datetime "created_at"
259 t.datetime "created_at"
260 - t.float "running_time", limit: 24
260 + t.float "running_time"
261 t.string "exit_status"
261 t.string "exit_status"
262 t.integer "memory_usage"
262 t.integer "memory_usage"
263 - t.index ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id", using: :btree
263 + t.index ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id"
264 end
264 end
265
265
266 - create_table "testcases", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
266 + create_table "testcases", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
267 t.integer "problem_id"
267 t.integer "problem_id"
268 t.integer "num"
268 t.integer "num"
269 t.integer "group"
269 t.integer "group"
270 t.integer "score"
270 t.integer "score"
271 t.text "input", limit: 4294967295
271 t.text "input", limit: 4294967295
272 t.text "sol", limit: 4294967295
272 t.text "sol", limit: 4294967295
273 t.datetime "created_at"
273 t.datetime "created_at"
274 t.datetime "updated_at"
274 t.datetime "updated_at"
275 - t.index ["problem_id"], name: "index_testcases_on_problem_id", using: :btree
275 + t.index ["problem_id"], name: "index_testcases_on_problem_id"
276 end
276 end
277
277
278 - create_table "user_contest_stats", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
278 + create_table "user_contest_stats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
279 t.integer "user_id"
279 t.integer "user_id"
280 t.datetime "started_at"
280 t.datetime "started_at"
281 t.datetime "created_at"
281 t.datetime "created_at"
282 t.datetime "updated_at"
282 t.datetime "updated_at"
283 - t.boolean "forced_logout"
284 end
283 end
285
284
286 - create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1" do |t|
285 + create_table "users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
287 t.string "login", limit: 50
286 t.string "login", limit: 50
288 t.string "full_name"
287 t.string "full_name"
289 t.string "hashed_password"
288 t.string "hashed_password"
290 t.string "salt", limit: 5
289 t.string "salt", limit: 5
291 t.string "alias"
290 t.string "alias"
292 t.string "email"
291 t.string "email"
293 t.integer "site_id"
292 t.integer "site_id"
294 t.integer "country_id"
293 t.integer "country_id"
295 t.boolean "activated", default: false
294 t.boolean "activated", default: false
296 t.datetime "created_at"
295 t.datetime "created_at"
297 t.datetime "updated_at"
296 t.datetime "updated_at"
298 t.string "section"
297 t.string "section"
299 t.boolean "enabled", default: true
298 t.boolean "enabled", default: true
300 t.string "remark"
299 t.string "remark"
301 t.string "last_ip"
300 t.string "last_ip"
302 - t.index ["login"], name: "index_users_on_login", unique: true, using: :btree
301 + t.index ["login"], name: "index_users_on_login", unique: true
303 end
302 end
304
303
305 add_foreign_key "problems_tags", "problems"
304 add_foreign_key "problems_tags", "problems"
306 add_foreign_key "problems_tags", "tags"
305 add_foreign_key "problems_tags", "tags"
307 end
306 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -20,31 +20,83
20 click_on "New user", match: :first
20 click_on "New user", match: :first
21 fill_in 'Login', with: 'test1'
21 fill_in 'Login', with: 'test1'
22 fill_in 'Full name', with: 'test1 McTestface'
22 fill_in 'Full name', with: 'test1 McTestface'
23 fill_in 'e-mail', with: 'a@a.com'
23 fill_in 'e-mail', with: 'a@a.com'
24 fill_in 'Password', with: 'abcdef'
24 fill_in 'Password', with: 'abcdef'
25 fill_in 'Password confirmation', with: 'abcdef'
25 fill_in 'Password confirmation', with: 'abcdef'
26
26
27 click_on 'Create'
27 click_on 'Create'
28
28
29 assert_text 'User was successfully created'
29 assert_text 'User was successfully created'
30 assert_text 'a@a.com'
30 assert_text 'a@a.com'
31 assert_text 'test1 McTestface'
31 assert_text 'test1 McTestface'
32
32
33 within('tr', text: 'McTestface') do
33 within('tr', text: 'McTestface') do
34 click_on 'Edit'
34 click_on 'Edit'
35 end
35 end
36
36
37 fill_in 'Alias', with: 'hahaha'
37 fill_in 'Alias', with: 'hahaha'
38 fill_in 'Remark', with: 'section 2'
38 fill_in 'Remark', with: 'section 2'
39 click_on 'Update User'
39 click_on 'Update User'
40
40
41 assert_text 'section 2'
41 assert_text 'section 2'
42 end
42 end
43
43
44 + test "add multiple users" do
45 + login 'admin', 'admin'
46 + within 'header' do
47 + click_on 'Manage'
48 + click_on 'Users', match: :first
49 + end
50 +
51 + click_on 'New list of users', match: :first
52 + find(:css, 'textarea').fill_in with:"abc1,Boaty McBoatface,abcdef,alias1,remark1,\nabc2,Boaty2 McSecond,acbdef123,aias2,remark2"
53 + click_on 'create users'
54 +
55 + assert_text('remark1')
56 + assert_text('remark2')
57 + end
58 +
59 + test "grant admin right" do
60 + login 'admin', 'admin'
61 + within 'header' do
62 + click_on 'Manage'
63 + click_on 'Users', match: :first
64 + end
65 +
66 + click_on "View administrator"
67 + fill_in 'login', with: 'john'
68 + click_on "Grant"
69 +
70 + visit logout_main_path
71 + login 'john','hello'
72 + within 'header' do
73 + click_on 'Manage'
74 + click_on 'Problem', match: :first
75 + end
76 + assert_text "Turn off all problems"
77 + end
78 +
79 + test "try using admin from normal user" do
80 + login 'admin','admin'
81 + visit bulk_manage_user_admin_index_path
82 + assert_current_path bulk_manage_user_admin_index_path
83 + visit logout_main_path
84 +
85 + login 'jack','morning'
86 + visit bulk_manage_user_admin_index_path
87 + assert_current_path root_path
88 + assert_text 'You are not authorized'
89 +
90 + login 'james','morning'
91 + visit new_list_user_admin_index_path
92 + assert_current_path root_path
93 + assert_text 'You are not authorized'
94 + end
95 +
44 def login(username,password)
96 def login(username,password)
45 visit root_path
97 visit root_path
46 fill_in "Login", with: username
98 fill_in "Login", with: username
47 fill_in "Password", with: password
99 fill_in "Password", with: password
48 click_on "Login"
100 click_on "Login"
49 end
101 end
50 end
102 end
You need to be logged in to leave comments. Login now