Description:
merge update to rail 4.2
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r623:0e5f52b4f443 - - 101 files changed: 461 inserted, 2007 deleted
| @@ -0,0 +1,8 | |||
|
|
1 | + development: | |
|
|
2 | + secret_key_base: '444f426d08add8e2d7cbd76e2057e521e06091231eb4d5472af6ba5654ea1124ce6a636f549be6827ce09561c314181226ad840d44e4677e1077942ee0dc82bd' | |
|
|
3 | + | |
|
|
4 | + test: | |
|
|
5 | + secret_key_base: 'd52f411b06a79cc9f56d92e10d27e670cf0f0c3357e7caf9018ec23091b5c452ea9266c03a5c9e37b72c358702d4d460e957f90dcc553c9fc73a98adb520e781' | |
|
|
6 | + | |
|
|
7 | + production: | |
|
|
8 | + secret_key_base: '7f85485d3d652fc6336dfe3cd98917d9bd7a323b32096bf7635d26b98ccd0480816cc2d12b5c10805cecf7d8fb322104e2bda71eb60dd871c5c537e56a063038' | |
| @@ -0,0 +1,13 | |||
|
|
1 | + require 'test_helper' | |
|
|
2 | + | |
|
|
3 | + class LoginTest < ActionDispatch::IntegrationTest | |
|
|
4 | + # test "the truth" do | |
|
|
5 | + # assert true | |
|
|
6 | + # end | |
|
|
7 | + | |
|
|
8 | + test "login with valid information" do | |
|
|
9 | + get root_path | |
|
|
10 | + assert_response :success | |
|
|
11 | + | |
|
|
12 | + end | |
|
|
13 | + end | |
| @@ -1,6 +1,7 | |||
|
|
1 | 1 | source 'https://rubygems.org' |
|
|
2 | 2 | |
|
|
3 |
- gem 'rails', '~> |
|
|
|
3 | + gem 'rails', '~>4.2.0' | |
|
|
4 | + gem 'activerecord-session_store' | |
|
|
4 | 5 | |
|
|
5 | 6 | gem 'select2-rails' |
|
|
6 | 7 | |
| @@ -8,20 +9,20 | |||
|
|
8 | 9 | # gem 'rails', :git => 'git://github.com/rails/rails.git' |
|
|
9 | 10 | |
|
|
10 | 11 | gem 'mysql2' |
|
|
12 | + gem 'sqlite3' | |
|
|
11 | 13 | |
|
|
12 | 14 | # Gems used only for assets and not required |
|
|
13 | 15 | # in production environments by default. |
|
|
14 | - group :assets do | |
|
|
15 | - gem 'sass-rails', '~> 3.2.6' | |
|
|
16 | - gem 'coffee-rails', '~> 3.2.2' | |
|
|
16 | + gem 'sass-rails' | |
|
|
17 | + gem 'coffee-rails' | |
|
|
17 | 18 | |
|
|
18 | 19 | # See https://github.com/sstephenson/execjs#readme for more supported runtimes |
|
|
19 | 20 | # gem 'therubyracer', :platforms => :ruby |
|
|
20 | 21 | |
|
|
21 | 22 |
|
|
|
22 | - end | |
|
|
23 | + | |
|
|
23 | 24 | |
|
|
24 | - gem 'prototype-rails' | |
|
|
25 | + # gem 'prototype-rails' | |
|
|
25 | 26 | |
|
|
26 | 27 | # To use ActiveModel has_secure_password |
|
|
27 | 28 | # gem 'bcrypt-ruby', '~> 3.0.0' |
| @@ -44,7 +45,7 | |||
|
|
44 | 45 | |
|
|
45 | 46 | # jquery addition |
|
|
46 | 47 | gem 'jquery-rails' |
|
|
47 |
- gem 'jquery-ui- |
|
|
|
48 | + gem 'jquery-ui-rails' | |
|
|
48 | 49 | gem 'jquery-timepicker-addon-rails' |
|
|
49 | 50 | gem 'jquery-tablesorter' |
|
|
50 | 51 | gem 'jquery-countdown-rails' |
| @@ -75,6 +76,3 | |||
|
|
75 | 76 | gem 'in_place_editing' |
|
|
76 | 77 | gem 'verification', :git => 'https://github.com/sikachu/verification.git' |
|
|
77 | 78 | |
|
|
78 | - group :test, :development do | |
|
|
79 | - gem 'rspec-rails', '~> 2.99.0' | |
|
|
80 | - end | |
| @@ -1,46 +1,59 | |||
|
|
1 | 1 | GIT |
|
|
2 | 2 | remote: https://github.com/sikachu/verification.git |
|
|
3 | - revision: 76eaf51b13276ecae54bd9cd115832595d2ff56d | |
|
|
3 | + revision: ff31697b940d7b0e2ec65f08764215c96104e76d | |
|
|
4 | 4 | specs: |
|
|
5 | 5 | verification (1.0.3) |
|
|
6 |
- actionpack (>= 3.0.0, < 5. |
|
|
|
7 |
- activesupport (>= 3.0.0, < 5. |
|
|
|
6 | + actionpack (>= 3.0.0, < 5.1) | |
|
|
7 | + activesupport (>= 3.0.0, < 5.1) | |
|
|
8 | 8 | |
|
|
9 | 9 | GEM |
|
|
10 | 10 | remote: https://rubygems.org/ |
|
|
11 | 11 | specs: |
|
|
12 |
- ace-rails-ap (4. |
|
|
|
13 |
- actionmailer ( |
|
|
|
14 |
- actionpack (= |
|
|
|
15 |
- |
|
|
|
16 |
- |
|
|
|
17 | - activemodel (= 3.2.22.5) | |
|
|
18 | - activesupport (= 3.2.22.5) | |
|
|
19 | - builder (~> 3.0.0) | |
|
|
12 | + ace-rails-ap (4.1.1) | |
|
|
13 | + actionmailer (4.2.7.1) | |
|
|
14 | + actionpack (= 4.2.7.1) | |
|
|
15 | + actionview (= 4.2.7.1) | |
|
|
16 | + activejob (= 4.2.7.1) | |
|
|
17 | + mail (~> 2.5, >= 2.5.4) | |
|
|
18 | + rails-dom-testing (~> 1.0, >= 1.0.5) | |
|
|
19 | + actionpack (4.2.7.1) | |
|
|
20 | + actionview (= 4.2.7.1) | |
|
|
21 | + activesupport (= 4.2.7.1) | |
|
|
22 | + rack (~> 1.6) | |
|
|
23 | + rack-test (~> 0.6.2) | |
|
|
24 | + rails-dom-testing (~> 1.0, >= 1.0.5) | |
|
|
25 | + rails-html-sanitizer (~> 1.0, >= 1.0.2) | |
|
|
26 | + actionview (4.2.7.1) | |
|
|
27 | + activesupport (= 4.2.7.1) | |
|
|
28 | + builder (~> 3.1) | |
|
|
20 | 29 | erubis (~> 2.7.0) |
|
|
21 | - journey (~> 1.0.4) | |
|
|
22 | - rack (~> 1.4.5) | |
|
|
23 | - rack-cache (~> 1.2) | |
|
|
24 |
- |
|
|
|
25 | - sprockets (~> 2.2.1) | |
|
|
26 |
- activemodel ( |
|
|
|
27 |
- activesupport (= |
|
|
|
28 |
- builder (~> 3. |
|
|
|
29 |
- activerecord ( |
|
|
|
30 |
- activemodel (= |
|
|
|
31 |
- activesupport (= |
|
|
|
32 |
- arel (~> |
|
|
|
33 | - tzinfo (~> 0.3.29) | |
|
|
34 | - activeresource (3.2.22.5) | |
|
|
35 |
- active |
|
|
|
36 | - activesupport (= 3.2.22.5) | |
|
|
37 | - activesupport (3.2.22.5) | |
|
|
38 | - i18n (~> 0.6, >= 0.6.4) | |
|
|
39 | - multi_json (~> 1.0) | |
|
|
40 | - arel (3.0.3) | |
|
|
41 | - autoprefixer-rails (6.0.3) | |
|
|
30 | + rails-dom-testing (~> 1.0, >= 1.0.5) | |
|
|
31 | + rails-html-sanitizer (~> 1.0, >= 1.0.2) | |
|
|
32 | + activejob (4.2.7.1) | |
|
|
33 | + activesupport (= 4.2.7.1) | |
|
|
34 | + globalid (>= 0.3.0) | |
|
|
35 | + activemodel (4.2.7.1) | |
|
|
36 | + activesupport (= 4.2.7.1) | |
|
|
37 | + builder (~> 3.1) | |
|
|
38 | + activerecord (4.2.7.1) | |
|
|
39 | + activemodel (= 4.2.7.1) | |
|
|
40 | + activesupport (= 4.2.7.1) | |
|
|
41 | + arel (~> 6.0) | |
|
|
42 | + activerecord-session_store (1.0.0) | |
|
|
43 | + actionpack (>= 4.0, < 5.1) | |
|
|
44 | + activerecord (>= 4.0, < 5.1) | |
|
|
45 | + multi_json (~> 1.11, >= 1.11.2) | |
|
|
46 | + rack (>= 1.5.2, < 3) | |
|
|
47 | + railties (>= 4.0, < 5.1) | |
|
|
48 | + activesupport (4.2.7.1) | |
|
|
49 | + i18n (~> 0.7) | |
|
|
50 | + json (~> 1.7, >= 1.7.7) | |
|
|
51 | + minitest (~> 5.1) | |
|
|
52 | + thread_safe (~> 0.3, >= 0.3.4) | |
|
|
53 | + tzinfo (~> 1.1) | |
|
|
54 | + arel (6.0.4) | |
|
|
55 | + autoprefixer-rails (6.6.0) | |
|
|
42 | 56 | execjs |
|
|
43 | - json | |
|
|
44 | 57 | best_in_place (3.0.3) |
|
|
45 | 58 | actionpack (>= 3.2) |
|
|
46 | 59 | railties (>= 3.2) |
| @@ -48,137 +61,138 | |||
|
|
48 | 61 | sass (~> 3.2) |
|
|
49 | 62 | bootstrap-switch-rails (3.3.3) |
|
|
50 | 63 | bootstrap-toggle-rails (2.2.1.0) |
|
|
51 |
- builder (3. |
|
|
|
52 |
- coffee-rails ( |
|
|
|
64 | + builder (3.2.2) | |
|
|
65 | + coffee-rails (4.2.1) | |
|
|
53 | 66 | coffee-script (>= 2.2.0) |
|
|
54 |
- railties ( |
|
|
|
55 |
- coffee-script (2. |
|
|
|
67 | + railties (>= 4.0.0, < 5.2.x) | |
|
|
68 | + coffee-script (2.4.1) | |
|
|
56 | 69 | coffee-script-source |
|
|
57 | 70 | execjs |
|
|
58 |
- coffee-script-source (1. |
|
|
|
59 | - diff-lcs (1.2.5) | |
|
|
71 | + coffee-script-source (1.12.2) | |
|
|
72 | + concurrent-ruby (1.0.4) | |
|
|
60 | 73 | dynamic_form (1.1.4) |
|
|
61 | 74 | erubis (2.7.0) |
|
|
62 |
- execjs (2. |
|
|
|
63 |
- |
|
|
|
75 | + execjs (2.7.0) | |
|
|
76 | + globalid (0.3.7) | |
|
|
77 | + activesupport (>= 4.1.0) | |
|
|
78 | + haml (4.0.7) | |
|
|
64 | 79 | tilt |
|
|
65 |
- haml-rails (0. |
|
|
|
66 |
- actionpack (>= |
|
|
|
67 |
- activesupport (>= |
|
|
|
68 |
- haml (>= |
|
|
|
69 |
- |
|
|
|
70 | - hike (1.2.3) | |
|
|
80 | + haml-rails (0.9.0) | |
|
|
81 | + actionpack (>= 4.0.1) | |
|
|
82 | + activesupport (>= 4.0.1) | |
|
|
83 | + haml (>= 4.0.6, < 5.0) | |
|
|
84 | + html2haml (>= 1.0.1) | |
|
|
85 | + railties (>= 4.0.1) | |
|
|
86 | + html2haml (2.0.0) | |
|
|
87 | + erubis (~> 2.7.0) | |
|
|
88 | + haml (~> 4.0.0) | |
|
|
89 | + nokogiri (~> 1.6.0) | |
|
|
90 | + ruby_parser (~> 3.5) | |
|
|
71 | 91 | i18n (0.7.0) |
|
|
72 | 92 | in_place_editing (1.2.0) |
|
|
73 | - journey (1.0.4) | |
|
|
74 | 93 | jquery-countdown-rails (2.0.2) |
|
|
75 |
- jquery-rails ( |
|
|
|
76 |
- rail |
|
|
|
94 | + jquery-rails (4.2.1) | |
|
|
95 | + rails-dom-testing (>= 1, < 3) | |
|
|
96 | + railties (>= 4.2.0) | |
|
|
77 | 97 | thor (>= 0.14, < 2.0) |
|
|
78 |
- jquery-tablesorter (1. |
|
|
|
79 |
- railties (>= 3. |
|
|
|
98 | + jquery-tablesorter (1.23.3) | |
|
|
99 | + railties (>= 3.2, < 6) | |
|
|
80 | 100 | jquery-timepicker-addon-rails (1.4.1) |
|
|
81 | 101 | railties (>= 3.1) |
|
|
82 |
- jquery-ui-rails ( |
|
|
|
83 | - jquery-rails | |
|
|
84 | - railties (>= 3.1.0) | |
|
|
85 | - jquery-ui-sass-rails (4.0.3.0) | |
|
|
86 | - jquery-rails | |
|
|
87 | - jquery-ui-rails (= 4.0.3) | |
|
|
88 | - railties (>= 3.1.0) | |
|
|
102 | + jquery-ui-rails (6.0.1) | |
|
|
103 | + railties (>= 3.2.16) | |
|
|
89 | 104 | json (1.8.3) |
|
|
90 |
- |
|
|
|
91 | - mime-types (~> 1.16) | |
|
|
92 | - treetop (~> 1.4.8) | |
|
|
93 |
- mime-types (1. |
|
|
|
94 | - momentjs-rails (2.11.1) | |
|
|
105 | + loofah (2.0.3) | |
|
|
106 | + nokogiri (>= 1.5.9) | |
|
|
107 | + mail (2.6.4) | |
|
|
108 | + mime-types (>= 1.16, < 4) | |
|
|
109 | + mime-types (3.1) | |
|
|
110 | + mime-types-data (~> 3.2015) | |
|
|
111 | + mime-types-data (3.2016.0521) | |
|
|
112 | + mini_portile2 (2.1.0) | |
|
|
113 | + minitest (5.10.1) | |
|
|
114 | + momentjs-rails (2.15.1) | |
|
|
95 | 115 | railties (>= 3.1) |
|
|
96 | 116 | multi_json (1.12.1) |
|
|
97 |
- mysql2 (0. |
|
|
|
98 | - polyglot (0.3.5) | |
|
|
99 | - power_assert (0.2.2) | |
|
|
100 | - prototype-rails (3.2.1) | |
|
|
101 | - rails (~> 3.2) | |
|
|
102 | - rack (1.4.7) | |
|
|
103 | - rack-cache (1.6.1) | |
|
|
104 | - rack (>= 0.4) | |
|
|
105 | - rack-ssl (1.3.4) | |
|
|
106 | - rack | |
|
|
117 | + mysql2 (0.4.5) | |
|
|
118 | + nokogiri (1.6.8.1) | |
|
|
119 | + mini_portile2 (~> 2.1.0) | |
|
|
120 | + power_assert (0.4.1) | |
|
|
121 | + rack (1.6.5) | |
|
|
107 | 122 | rack-test (0.6.3) |
|
|
108 | 123 | rack (>= 1.0) |
|
|
109 |
- rails ( |
|
|
|
110 |
- actionmailer (= |
|
|
|
111 |
- actionpack (= |
|
|
|
112 |
- acti |
|
|
|
113 |
- active |
|
|
|
114 |
- active |
|
|
|
115 | - bundler (~> 1.0) | |
|
|
116 |
- |
|
|
|
117 | - rails_bootstrap_sortable (2.0.0) | |
|
|
118 |
- |
|
|
|
119 | - railties (3.2.22.5) | |
|
|
120 | - actionpack (= 3.2.22.5) | |
|
|
121 |
- activesupport ( |
|
|
|
122 | - rack-ssl (~> 1.3.2) | |
|
|
124 | + rails (4.2.7.1) | |
|
|
125 | + actionmailer (= 4.2.7.1) | |
|
|
126 | + actionpack (= 4.2.7.1) | |
|
|
127 | + actionview (= 4.2.7.1) | |
|
|
128 | + activejob (= 4.2.7.1) | |
|
|
129 | + activemodel (= 4.2.7.1) | |
|
|
130 | + activerecord (= 4.2.7.1) | |
|
|
131 | + activesupport (= 4.2.7.1) | |
|
|
132 | + bundler (>= 1.3.0, < 2.0) | |
|
|
133 | + railties (= 4.2.7.1) | |
|
|
134 | + sprockets-rails | |
|
|
135 | + rails-deprecated_sanitizer (1.0.3) | |
|
|
136 | + activesupport (>= 4.2.0.alpha) | |
|
|
137 | + rails-dom-testing (1.0.8) | |
|
|
138 | + activesupport (>= 4.2.0.beta, < 5.0) | |
|
|
139 | + nokogiri (~> 1.6) | |
|
|
140 | + rails-deprecated_sanitizer (>= 1.0.1) | |
|
|
141 | + rails-html-sanitizer (1.0.3) | |
|
|
142 | + loofah (~> 2.0) | |
|
|
143 | + rails_bootstrap_sortable (2.0.1) | |
|
|
144 | + momentjs-rails (>= 2.8.3) | |
|
|
145 | + railties (4.2.7.1) | |
|
|
146 | + actionpack (= 4.2.7.1) | |
|
|
147 | + activesupport (= 4.2.7.1) | |
|
|
123 | 148 | rake (>= 0.8.7) |
|
|
124 | - rdoc (~> 3.4) | |
|
|
125 | - thor (>= 0.14.6, < 2.0) | |
|
|
126 | - rake (11.2.2) | |
|
|
127 |
- r |
|
|
|
128 | - rdoc (3.12.2) | |
|
|
129 |
- |
|
|
|
130 | - rouge (1.8.0) | |
|
|
131 | - rspec-collection_matchers (1.1.2) | |
|
|
132 | - rspec-expectations (>= 2.99.0.beta1) | |
|
|
133 | - rspec-core (2.99.2) | |
|
|
134 | - rspec-expectations (2.99.2) | |
|
|
135 |
- |
|
|
|
136 | - rspec-mocks (2.99.3) | |
|
|
137 |
- |
|
|
|
138 | - actionpack (>= 3.0) | |
|
|
139 | - activemodel (>= 3.0) | |
|
|
140 | - activesupport (>= 3.0) | |
|
|
141 | - railties (>= 3.0) | |
|
|
142 | - rspec-collection_matchers | |
|
|
143 | - rspec-core (~> 2.99.0) | |
|
|
144 | - rspec-expectations (~> 2.99.0) | |
|
|
145 | - rspec-mocks (~> 2.99.0) | |
|
|
146 | - sass (3.4.11) | |
|
|
147 | - sass-rails (3.2.6) | |
|
|
148 | - railties (~> 3.2.0) | |
|
|
149 | - sass (>= 3.1.10) | |
|
|
150 | - tilt (~> 1.3) | |
|
|
151 | - select2-rails (4.0.1) | |
|
|
149 | + thor (>= 0.18.1, < 2.0) | |
|
|
150 | + rake (12.0.0) | |
|
|
151 | + rdiscount (2.2.0.1) | |
|
|
152 | + rouge (2.0.7) | |
|
|
153 | + ruby_parser (3.8.3) | |
|
|
154 | + sexp_processor (~> 4.1) | |
|
|
155 | + sass (3.4.23) | |
|
|
156 | + sass-rails (5.0.6) | |
|
|
157 | + railties (>= 4.0.0, < 6) | |
|
|
158 | + sass (~> 3.1) | |
|
|
159 | + sprockets (>= 2.8, < 4.0) | |
|
|
160 | + sprockets-rails (>= 2.0, < 4.0) | |
|
|
161 | + tilt (>= 1.1, < 3) | |
|
|
162 | + select2-rails (4.0.3) | |
|
|
152 | 163 | thor (~> 0.14) |
|
|
153 |
- s |
|
|
|
154 | - hike (~> 1.2) | |
|
|
155 |
- |
|
|
|
156 |
- rack ( |
|
|
|
157 | - tilt (~> 1.1, != 1.3.0) | |
|
|
158 | - test-unit (3.0.9) | |
|
|
164 | + sexp_processor (4.7.0) | |
|
|
165 | + sprockets (3.7.1) | |
|
|
166 | + concurrent-ruby (~> 1.0) | |
|
|
167 | + rack (> 1, < 3) | |
|
|
168 | + sprockets-rails (3.2.0) | |
|
|
169 | + actionpack (>= 4.0) | |
|
|
170 | + activesupport (>= 4.0) | |
|
|
171 | + sprockets (>= 3.0.0) | |
|
|
172 | + sqlite3 (1.3.12) | |
|
|
173 | + test-unit (3.2.3) | |
|
|
159 | 174 | power_assert |
|
|
160 |
- thor (0.19. |
|
|
|
161 | - tilt (1.4.1) | |
|
|
162 |
- t |
|
|
|
163 | - polyglot | |
|
|
164 | - polyglot (>= 0.3.1) | |
|
|
165 | - tzinfo (0.3.51) | |
|
|
166 | - uglifier (2.7.0) | |
|
|
167 | - execjs (>= 0.3.0) | |
|
|
168 | - json (>= 1.8.0) | |
|
|
169 | - will_paginate (3.0.7) | |
|
|
175 | + thor (0.19.4) | |
|
|
176 | + thread_safe (0.3.5) | |
|
|
177 | + tilt (2.0.5) | |
|
|
178 | + tzinfo (1.2.2) | |
|
|
179 | + thread_safe (~> 0.1) | |
|
|
180 | + uglifier (3.0.4) | |
|
|
181 | + execjs (>= 0.3.0, < 3) | |
|
|
182 | + will_paginate (3.0.12) | |
|
|
170 | 183 | |
|
|
171 | 184 | PLATFORMS |
|
|
172 | 185 | ruby |
|
|
173 | 186 | |
|
|
174 | 187 | DEPENDENCIES |
|
|
175 | 188 | ace-rails-ap |
|
|
189 | + activerecord-session_store | |
|
|
176 | 190 | autoprefixer-rails |
|
|
177 | 191 | best_in_place (~> 3.0.1) |
|
|
178 | 192 | bootstrap-sass (~> 3.2.0) |
|
|
179 | 193 | bootstrap-switch-rails |
|
|
180 | 194 | bootstrap-toggle-rails |
|
|
181 |
- coffee-rails |
|
|
|
195 | + coffee-rails | |
|
|
182 | 196 | dynamic_form |
|
|
183 | 197 | haml |
|
|
184 | 198 | haml-rails |
| @@ -187,22 +201,21 | |||
|
|
187 | 201 | jquery-rails |
|
|
188 | 202 | jquery-tablesorter |
|
|
189 | 203 | jquery-timepicker-addon-rails |
|
|
190 |
- jquery-ui- |
|
|
|
204 | + jquery-ui-rails | |
|
|
191 | 205 | |
|
|
192 | 206 | momentjs-rails |
|
|
193 | 207 | mysql2 |
|
|
194 | - prototype-rails | |
|
|
195 | - rails (~> 3.2) | |
|
|
208 | + rails (~> 4.2.0) | |
|
|
196 | 209 | rails_bootstrap_sortable |
|
|
197 | 210 | rdiscount |
|
|
198 | 211 | rouge |
|
|
199 | - rspec-rails (~> 2.99.0) | |
|
|
200 | - sass-rails (~> 3.2.6) | |
|
|
212 | + sass-rails | |
|
|
201 | 213 | select2-rails |
|
|
214 | + sqlite3 | |
|
|
202 | 215 | test-unit |
|
|
203 | 216 | uglifier |
|
|
204 | 217 | verification! |
|
|
205 | 218 | will_paginate (~> 3.0.7) |
|
|
206 | 219 | |
|
|
207 | 220 | BUNDLED WITH |
|
|
208 |
- 1.1 |
|
|
|
221 | + 1.13.6 | |
| @@ -12,7 +12,7 | |||
|
|
12 | 12 | // |
|
|
13 | 13 | //= require jquery |
|
|
14 | 14 | //= require jquery_ujs |
|
|
15 |
- //= require jquery |
|
|
|
15 | + //= require jquery-ui | |
|
|
16 | 16 | //= require bootstrap-sprockets |
|
|
17 | 17 | //= require moment |
|
|
18 | 18 | //= require bootstrap-sortable |
| @@ -28,9 +28,6 | |||
|
|
28 | 28 | //= require custom |
|
|
29 | 29 | //= require jquery.countdown |
|
|
30 | 30 | //-------------- addition from local_jquery ----------- |
|
|
31 | - //= require jquery.ui.datepicker | |
|
|
32 | - //= require jquery.ui.slider | |
|
|
33 | - //= require jquery-ui-timepicker-addon | |
|
|
34 | 31 | //= require jquery-tablesorter |
|
|
35 | 32 | //= require best_in_place |
|
|
36 | 33 | //= require best_in_place.jquery-ui |
| @@ -1,13 +1,3 | |||
|
|
1 | - //= require jquery | |
|
|
2 | - //= require jquery_ujs | |
|
|
3 | - //= require jquery.ui.all | |
|
|
4 | - //= require jquery.ui.datepicker | |
|
|
5 | - //= require jquery.ui.slider | |
|
|
6 | - //= require jquery-ui-timepicker-addon | |
|
|
7 | - //= require jquery-tablesorter | |
|
|
8 | - //= require best_in_place | |
|
|
9 | - //= require best_in_place.jquery-ui | |
|
|
10 | - | |
|
|
11 | 1 |
|
|
|
12 | 2 | /* Activating Best In Place */ |
|
|
13 | 3 | jQuery(".best_in_place").best_in_place(); |
| @@ -14,11 +14,11 | |||
|
|
14 | 14 | * # *= require_self |
|
|
15 | 15 | */ |
|
|
16 | 16 | |
|
|
17 |
- @import "jquery |
|
|
|
18 | - @import "jquery.ui.core"; | |
|
|
19 | - @import "jquery.ui.theme"; | |
|
|
20 | - @import "jquery.ui.datepicker"; | |
|
|
21 | - @import "jquery.ui.slider"; | |
|
|
17 | + @import "jquery-ui"; | |
|
|
18 | + //@import "jquery.ui.core"; | |
|
|
19 | + //@import "jquery.ui.theme"; | |
|
|
20 | + //@import "jquery.ui.datepicker"; | |
|
|
21 | + //@import "jquery.ui.slider"; | |
|
|
22 | 22 | @import "jquery-ui-timepicker-addon"; |
|
|
23 | 23 | @import "jquery-tablesorter/theme.metro-dark"; |
|
|
24 | 24 | @import "jquery.countdown"; |
| @@ -7,8 +7,7 | |||
|
|
7 | 7 | # GET /announcements |
|
|
8 | 8 | # GET /announcements.xml |
|
|
9 | 9 | def index |
|
|
10 |
- @announcements = Announcement. |
|
|
|
11 | - :order => "created_at DESC") | |
|
|
10 | + @announcements = Announcement.order(created_at: :desc) | |
|
|
12 | 11 | |
|
|
13 | 12 | respond_to do |format| |
|
|
14 | 13 | format.html # index.html.erb |
| @@ -66,7 +65,7 | |||
|
|
66 | 65 | @announcement = Announcement.find(params[:id]) |
|
|
67 | 66 | |
|
|
68 | 67 | respond_to do |format| |
|
|
69 |
- if @announcement.update_attributes( |
|
|
|
68 | + if @announcement.update_attributes(announcement_params) | |
|
|
70 | 69 | flash[:notice] = 'Announcement was successfully updated.' |
|
|
71 | 70 | format.html { redirect_to(@announcement) } |
|
|
72 | 71 | format.js {} |
| @@ -108,4 +107,10 | |||
|
|
108 | 107 | format.xml { head :ok } |
|
|
109 | 108 | end |
|
|
110 | 109 | end |
|
|
110 | + | |
|
|
111 | + private | |
|
|
112 | + | |
|
|
113 | + def announcement_params | |
|
|
114 | + params.require(:announcement).permit(:author, :body, :published, :frontpage, :contest_only,:title, :note) | |
|
|
111 | 115 | end |
|
|
116 | + end | |
| @@ -20,7 +20,7 | |||
|
|
20 | 20 | |
|
|
21 | 21 | def admin_authorization |
|
|
22 | 22 | return false unless authenticate |
|
|
23 |
- user = User.find(session[:user_id] |
|
|
|
23 | + user = User.includes(:roles).find(session[:user_id]) | |
|
|
24 | 24 | unless user.admin? |
|
|
25 | 25 | unauthorized_redirect |
|
|
26 | 26 | return false |
| @@ -5,8 +5,7 | |||
|
|
5 | 5 | |
|
|
6 | 6 | |
|
|
7 | 7 | def index |
|
|
8 |
- @configurations = GraderConfiguration. |
|
|
|
9 | - :order => '`key`') | |
|
|
8 | + @configurations = GraderConfiguration.order(:key) | |
|
|
10 | 9 | @group = GraderConfiguration.pluck("grader_configurations.key").map{ |x| x[0...(x.index('.'))] }.uniq.sort |
|
|
11 | 10 | end |
|
|
12 | 11 | |
| @@ -19,7 +18,7 | |||
|
|
19 | 18 | @config = GraderConfiguration.find(params[:id]) |
|
|
20 | 19 | User.clear_last_login if @config.key == GraderConfiguration::MULTIPLE_IP_LOGIN_KEY and @config.value == 'true' and params[:grader_configuration][:value] == 'false' |
|
|
21 | 20 | respond_to do |format| |
|
|
22 |
- if @config.update_attributes( |
|
|
|
21 | + if @config.update_attributes(configuration_params) | |
|
|
23 | 22 | format.json { head :ok } |
|
|
24 | 23 | else |
|
|
25 | 24 | format.json { respond_with_bip(@config) } |
| @@ -27,4 +26,9 | |||
|
|
27 | 26 | end |
|
|
28 | 27 | end |
|
|
29 | 28 | |
|
|
29 | + private | |
|
|
30 | + def configuration_params | |
|
|
31 | + params.require(:grader_configuration).permit(:key,:value_type,:value,:description) | |
|
|
30 | 32 | end |
|
|
33 | + | |
|
|
34 | + end | |
| @@ -11,9 +11,9 | |||
|
|
11 | 11 | redirect_to :action => 'index' and return |
|
|
12 | 12 | end |
|
|
13 | 13 | |
|
|
14 |
- @users = User. |
|
|
|
14 | + @users = User.all | |
|
|
15 | 15 | @start_times = {} |
|
|
16 |
- UserContestStat. |
|
|
|
16 | + UserContestStat.all.each do |stat| | |
|
|
17 | 17 | @start_times[stat.user_id] = stat.started_at |
|
|
18 | 18 | end |
|
|
19 | 19 | end |
| @@ -66,7 +66,7 | |||
|
|
66 | 66 | @contest = Contest.find(params[:id]) |
|
|
67 | 67 | |
|
|
68 | 68 | respond_to do |format| |
|
|
69 |
- if @contest.update_attributes( |
|
|
|
69 | + if @contest.update_attributes(contests_params) | |
|
|
70 | 70 | flash[:notice] = 'Contest was successfully updated.' |
|
|
71 | 71 | format.html { redirect_to(@contest) } |
|
|
72 | 72 | format.xml { head :ok } |
| @@ -89,4 +89,10 | |||
|
|
89 | 89 | end |
|
|
90 | 90 | end |
|
|
91 | 91 | |
|
|
92 | + private | |
|
|
93 | + | |
|
|
94 | + def contests_params | |
|
|
95 | + params.require(:contest).permit(:title,:enabled,:name) | |
|
|
92 | 96 | end |
|
|
97 | + | |
|
|
98 | + end | |
| @@ -35,10 +35,8 | |||
|
|
35 | 35 | |
|
|
36 | 36 | @terminated_processes = GraderProcess.find_terminated_graders |
|
|
37 | 37 | |
|
|
38 |
- @last_task = Task. |
|
|
|
39 | - :order => 'created_at DESC') | |
|
|
40 | - @last_test_request = TestRequest.find(:first, | |
|
|
41 | - :order => 'created_at DESC') | |
|
|
38 | + @last_task = Task.last | |
|
|
39 | + @last_test_request = TestRequest.last | |
|
|
42 | 40 | @submission = Submission.order("id desc").limit(20) |
|
|
43 | 41 | @backlog_submission = Submission.where('graded_at is null') |
|
|
44 | 42 | end |
| @@ -57,7 +55,7 | |||
|
|
57 | 55 | end |
|
|
58 | 56 | |
|
|
59 | 57 | def clear_all |
|
|
60 |
- GraderProcess. |
|
|
|
58 | + GraderProcess.all.each do |p| | |
|
|
61 | 59 | p.destroy |
|
|
62 | 60 | end |
|
|
63 | 61 | redirect_to :action => 'list' |
| @@ -45,7 +45,7 | |||
|
|
45 | 45 | # @hidelogin = true |
|
|
46 | 46 | # end |
|
|
47 | 47 | |
|
|
48 |
- @announcements = Announcement. |
|
|
|
48 | + @announcements = Announcement.frontpage | |
|
|
49 | 49 | render :action => 'login', :layout => 'empty' |
|
|
50 | 50 | end |
|
|
51 | 51 | |
| @@ -217,9 +217,9 | |||
|
|
217 | 217 | |
|
|
218 | 218 | def prepare_announcements(recent=nil) |
|
|
219 | 219 | if GraderConfiguration.show_tasks_to?(@user) |
|
|
220 |
- @announcements = Announcement. |
|
|
|
220 | + @announcements = Announcement.published(true) | |
|
|
221 | 221 | else |
|
|
222 |
- @announcements = Announcement. |
|
|
|
222 | + @announcements = Announcement.published | |
|
|
223 | 223 | end |
|
|
224 | 224 | if recent!=nil |
|
|
225 | 225 | recent_id = recent.to_i |
| @@ -7,7 +7,7 | |||
|
|
7 | 7 | in_place_edit_for :problem, :full_score |
|
|
8 | 8 | |
|
|
9 | 9 | def index |
|
|
10 |
- @problems = Problem. |
|
|
|
10 | + @problems = Problem.order(date_added: :desc) | |
|
|
11 | 11 | end |
|
|
12 | 12 | |
|
|
13 | 13 | # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) |
| @@ -135,8 +135,7 | |||
|
|
135 | 135 | end |
|
|
136 | 136 | |
|
|
137 | 137 | def turn_all_off |
|
|
138 | - Problem.find(:all, | |
|
|
139 | - :conditions => "available = 1").each do |problem| | |
|
|
138 | + Problem.available.all.each do |problem| | |
|
|
140 | 139 | problem.available = false |
|
|
141 | 140 | problem.save |
|
|
142 | 141 | end |
| @@ -144,8 +143,7 | |||
|
|
144 | 143 | end |
|
|
145 | 144 | |
|
|
146 | 145 | def turn_all_on |
|
|
147 | - Problem.find(:all, | |
|
|
148 | - :conditions => "available = 0").each do |problem| | |
|
|
146 | + Problem.where.not(available: true).each do |problem| | |
|
|
149 | 147 | problem.available = true |
|
|
150 | 148 | problem.save |
|
|
151 | 149 | end |
| @@ -176,7 +174,7 | |||
|
|
176 | 174 | end |
|
|
177 | 175 | |
|
|
178 | 176 | def manage |
|
|
179 |
- @problems = Problem. |
|
|
|
177 | + @problems = Problem.order(date_added: :desc) | |
|
|
180 | 178 | end |
|
|
181 | 179 | |
|
|
182 | 180 | def do_manage |
| @@ -9,18 +9,14 | |||
|
|
9 | 9 | before_filter(only: [:problem_hof]) { |c| |
|
|
10 | 10 | return false unless authenticate |
|
|
11 | 11 | |
|
|
12 |
- |
|
|
|
13 | - return true; | |
|
|
14 | - end | |
|
|
15 | - | |
|
|
16 | - admin_authorization | |
|
|
12 | + admin_authorization unless GraderConfiguration["right.user_view_submission"] | |
|
|
17 | 13 | } |
|
|
18 | 14 | |
|
|
19 | 15 | def max_score |
|
|
20 | 16 | end |
|
|
21 | 17 | |
|
|
22 | 18 | def current_score |
|
|
23 |
- @problems = Problem. |
|
|
|
19 | + @problems = Problem.available_problems | |
|
|
24 | 20 | @users = User.includes(:contests).includes(:contest_stat).where(enabled: true) |
|
|
25 | 21 | @scorearray = calculate_max_score(@problems, @users,0,0,true) |
|
|
26 | 22 | |
| @@ -46,7 +42,7 | |||
|
|
46 | 42 | |
|
|
47 | 43 | #users |
|
|
48 | 44 | @users = if params[:user] == "all" then |
|
|
49 |
- User. |
|
|
|
45 | + User.includes(:contests).includes(:contest_stat) | |
|
|
50 | 46 | else |
|
|
51 | 47 | User.includes(:contests).includes(:contest_stat).where(enabled: true) |
|
|
52 | 48 | end |
| @@ -73,9 +69,9 | |||
|
|
73 | 69 | if params[:commit] == 'download csv' |
|
|
74 | 70 | @problems = Problem.all |
|
|
75 | 71 | else |
|
|
76 |
- @problems = Problem. |
|
|
|
72 | + @problems = Problem.available_problems | |
|
|
77 | 73 | end |
|
|
78 |
- @users = User.includes(:contests, :contest_stat).where(enabled: true) |
|
|
|
74 | + @users = User.includes(:contests, :contest_stat).where(enabled: true) | |
|
|
79 | 75 | @scorearray = Array.new |
|
|
80 | 76 | @users.each do |u| |
|
|
81 | 77 | ustat = Array.new |
| @@ -4,7 +4,7 | |||
|
|
4 | 4 | |
|
|
5 | 5 | def login |
|
|
6 | 6 | # Site administrator login |
|
|
7 |
- @countries = Country. |
|
|
|
7 | + @countries = Country.includes(:sites).all | |
|
|
8 | 8 | @country_select = @countries.collect { |c| [c.name, c.id] } |
|
|
9 | 9 | |
|
|
10 | 10 | @country_select_with_all = [['Any',0]] |
| @@ -59,4 +59,9 | |||
|
|
59 | 59 | end |
|
|
60 | 60 | end |
|
|
61 | 61 | |
|
|
62 | + private | |
|
|
63 | + def site_params | |
|
|
64 | + params.require(:site).permit() | |
|
|
62 | 65 | end |
|
|
66 | + | |
|
|
67 | + end | |
| @@ -5,7 +5,7 | |||
|
|
5 | 5 | # GET /sites |
|
|
6 | 6 | # GET /sites.xml |
|
|
7 | 7 | def index |
|
|
8 |
- @sites = Site. |
|
|
|
8 | + @sites = Site.order(:country_id) | |
|
|
9 | 9 | |
|
|
10 | 10 | respond_to do |format| |
|
|
11 | 11 | format.html # index.html.erb |
| @@ -65,7 +65,7 | |||
|
|
65 | 65 | @site.clear_start_time_if_not_started |
|
|
66 | 66 | |
|
|
67 | 67 | respond_to do |format| |
|
|
68 |
- if @site.update_attributes(params |
|
|
|
68 | + if @site.update_attributes(site_params) | |
|
|
69 | 69 | flash[:notice] = 'Site was successfully updated.' |
|
|
70 | 70 | format.html { redirect_to(@site) } |
|
|
71 | 71 | format.xml { head :ok } |
| @@ -88,4 +88,10 | |||
|
|
88 | 88 | end |
|
|
89 | 89 | end |
|
|
90 | 90 | |
|
|
91 | + private | |
|
|
92 | + | |
|
|
93 | + def site_params | |
|
|
94 | + params.require(:site).permit(:name,:started,:start_time,:country_id,:password) | |
|
|
91 | 95 | end |
|
|
96 | + | |
|
|
97 | + end | |
| @@ -1,6 +1,6 | |||
|
|
1 | 1 | class SubmissionsController < ApplicationController |
|
|
2 | 2 | before_filter :authenticate |
|
|
3 | - before_filter :submission_authorization, only: [:show, :direct_edit_submission] | |
|
|
3 | + before_filter :submission_authorization, only: [:show, :direct_edit_submission, :download] | |
|
|
4 | 4 | |
|
|
5 | 5 | # GET /submissions |
|
|
6 | 6 | # GET /submissions.json |
| @@ -33,6 +33,18 | |||
|
|
33 | 33 | SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin? |
|
|
34 | 34 | end |
|
|
35 | 35 | |
|
|
36 | + def download | |
|
|
37 | + @submission = Submission.find(params[:id]) | |
|
|
38 | + send_data(@submission.source, {:filename => @submission.download_filename, :type => 'text/plain'}) | |
|
|
39 | + end | |
|
|
40 | + | |
|
|
41 | + def compiler_msg | |
|
|
42 | + @submission = Submission.find(params[:id]) | |
|
|
43 | + respond_to do |format| | |
|
|
44 | + format.js | |
|
|
45 | + end | |
|
|
46 | + end | |
|
|
47 | + | |
|
|
36 | 48 | #on-site new submission on specific problem |
|
|
37 | 49 | def direct_edit_problem |
|
|
38 | 50 | @problem = Problem.find(params[:problem_id]) |
| @@ -60,63 +72,9 | |||
|
|
60 | 72 | end |
|
|
61 | 73 | end |
|
|
62 | 74 | |
|
|
63 | - # # GET /submissions/new | |
|
|
64 | - # # GET /submissions/new.json | |
|
|
65 | - # def new | |
|
|
66 | - # @submission = Submission.new | |
|
|
67 | - # | |
|
|
68 | - # respond_to do |format| | |
|
|
69 | - # format.html # new.html.erb | |
|
|
70 | - # format.json { render json: @submission } | |
|
|
71 | - # end | |
|
|
72 | - # end | |
|
|
73 | - # | |
|
|
74 | - # | |
|
|
75 | - # # POST /submissions | |
|
|
76 | - # # POST /submissions.json | |
|
|
77 | - # def create | |
|
|
78 | - # @submission = Submission.new(params[:submission]) | |
|
|
79 | - # | |
|
|
80 | - # respond_to do |format| | |
|
|
81 | - # if @submission.save | |
|
|
82 | - # format.html { redirect_to @submission, notice: 'Submission was successfully created.' } | |
|
|
83 | - # format.json { render json: @submission, status: :created, location: @submission } | |
|
|
84 | - # else | |
|
|
85 | - # format.html { render action: "new" } | |
|
|
86 | - # format.json { render json: @submission.errors, status: :unprocessable_entity } | |
|
|
87 | - # end | |
|
|
88 | - # end | |
|
|
89 | - # end | |
|
|
90 | - # | |
|
|
91 | - # # PUT /submissions/1 | |
|
|
92 | - # # PUT /submissions/1.json | |
|
|
93 | - # def update | |
|
|
94 | - # @submission = Submission.find(params[:id]) | |
|
|
95 | - # | |
|
|
96 | - # respond_to do |format| | |
|
|
97 | - # if @submission.update_attributes(params[:submission]) | |
|
|
98 | - # format.html { redirect_to @submission, notice: 'Submission was successfully updated.' } | |
|
|
99 | - # format.json { head :no_content } | |
|
|
100 | - # else | |
|
|
101 | - # format.html { render action: "edit" } | |
|
|
102 | - # format.json { render json: @submission.errors, status: :unprocessable_entity } | |
|
|
103 | - # end | |
|
|
104 | - # end | |
|
|
105 | - # end | |
|
|
106 | - # | |
|
|
107 | - # # DELETE /submissions/1 | |
|
|
108 | - # # DELETE /submissions/1.json | |
|
|
109 | - # def destroy | |
|
|
110 | - # @submission = Submission.find(params[:id]) | |
|
|
111 | - # @submission.destroy | |
|
|
112 | - # | |
|
|
113 | - # respond_to do |format| | |
|
|
114 | - # format.html { redirect_to submissions_url } | |
|
|
115 | - # format.json { head :no_content } | |
|
|
116 | - # end | |
|
|
117 | - # end | |
|
|
118 | 75 | |
|
|
119 | 76 | protected |
|
|
77 | + | |
|
|
120 | 78 | def submission_authorization |
|
|
121 | 79 | #admin always has privileged |
|
|
122 | 80 | if @current_user.admin? |
| @@ -134,4 +92,5 | |||
|
|
134 | 92 | return false |
|
|
135 | 93 | end |
|
|
136 | 94 | |
|
|
95 | + | |
|
|
137 | 96 | end |
| @@ -29,7 +29,7 | |||
|
|
29 | 29 | end |
|
|
30 | 30 | |
|
|
31 | 31 | def active |
|
|
32 |
- sessions = ActiveRecord::SessionStore::Session. |
|
|
|
32 | + sessions = ActiveRecord::SessionStore::Session.where("updated_at >= ?", 60.minutes.ago) | |
|
|
33 | 33 | @users = [] |
|
|
34 | 34 | sessions.each do |session| |
|
|
35 | 35 | if session.data[:user_id] |
| @@ -118,7 +118,7 | |||
|
|
118 | 118 | |
|
|
119 | 119 | def update |
|
|
120 | 120 | @user = User.find(params[:id]) |
|
|
121 |
- if @user.update_attributes(params |
|
|
|
121 | + if @user.update_attributes(user_params) | |
|
|
122 | 122 | flash[:notice] = 'User was successfully updated.' |
|
|
123 | 123 | redirect_to :action => 'show', :id => @user |
|
|
124 | 124 | else |
| @@ -135,9 +135,9 | |||
|
|
135 | 135 | if params[:commit] == 'download csv' |
|
|
136 | 136 | @problems = Problem.all |
|
|
137 | 137 | else |
|
|
138 |
- @problems = Problem. |
|
|
|
138 | + @problems = Problem.available_problems | |
|
|
139 | 139 | end |
|
|
140 |
- @users = User.includes(:contests, :contest_stat).where(enabled: true) |
|
|
|
140 | + @users = User.includes(:contests, :contest_stat).where(enabled: true) | |
|
|
141 | 141 | @scorearray = Array.new |
|
|
142 | 142 | @users.each do |u| |
|
|
143 | 143 | ustat = Array.new |
| @@ -164,9 +164,9 | |||
|
|
164 | 164 | if params[:commit] == 'download csv' |
|
|
165 | 165 | @problems = Problem.all |
|
|
166 | 166 | else |
|
|
167 |
- @problems = Problem. |
|
|
|
167 | + @problems = Problem.available_problems | |
|
|
168 | 168 | end |
|
|
169 |
- @users = User. |
|
|
|
169 | + @users = User.includes(:contests).includes(:contest_stat).all | |
|
|
170 | 170 | @scorearray = Array.new |
|
|
171 | 171 | #set up range from param |
|
|
172 | 172 | since_id = params.fetch(:since_id, 0).to_i |
| @@ -201,7 +201,7 | |||
|
|
201 | 201 | end |
|
|
202 | 202 | |
|
|
203 | 203 | def random_all_passwords |
|
|
204 |
- users = User. |
|
|
|
204 | + users = User.all | |
|
|
205 | 205 | @prefix = params[:prefix] || '' |
|
|
206 | 206 | @non_admin_users = User.find_non_admin_with_prefix(@prefix) |
|
|
207 | 207 | @changed = false |
| @@ -324,7 +324,7 | |||
|
|
324 | 324 | # admin management |
|
|
325 | 325 | |
|
|
326 | 326 | def admin |
|
|
327 |
- @admins = User. |
|
|
|
327 | + @admins = User.all.find_all {|user| user.admin? } | |
|
|
328 | 328 | end |
|
|
329 | 329 | |
|
|
330 | 330 | def grant_admin |
| @@ -535,4 +535,9 | |||
|
|
535 | 535 | end |
|
|
536 | 536 | end |
|
|
537 | 537 | end |
|
|
538 | + | |
|
|
539 | + private | |
|
|
540 | + def user_params | |
|
|
541 | + params.require(:user).permit(:login,:full_name,:hashed_password,:salt,:alias,:email,:site_id,:country_id,:activated,:enabled,:remark,:last_ip,:section) | |
|
|
538 | 542 | end |
|
|
543 | + end | |
| @@ -1,21 +1,15 | |||
|
|
1 | 1 | class Announcement < ActiveRecord::Base |
|
|
2 | 2 | |
|
|
3 |
- def self. |
|
|
|
3 | + def self.published(contest_started=false) | |
|
|
4 | 4 | if contest_started |
|
|
5 | - Announcement.find(:all, | |
|
|
6 | - :conditions => "(published = 1) AND (frontpage = 0)", | |
|
|
7 | - :order => "created_at DESC") | |
|
|
5 | + where(published: true).where(frontpage: false).order(created_at: :desc) | |
|
|
8 | 6 | else |
|
|
9 | - Announcement.find(:all, | |
|
|
10 | - :conditions => "(published = 1) AND (frontpage = 0) AND (contest_only = 0)", | |
|
|
11 | - :order => "created_at DESC") | |
|
|
7 | + where(published: true).where(frontpage: false).where(contest_only: false).order(created_at: :desc) | |
|
|
12 | 8 | end |
|
|
13 | 9 | end |
|
|
14 | 10 | |
|
|
15 |
- def self. |
|
|
|
16 | - Announcement.find(:all, | |
|
|
17 | - :conditions => "(published = 1) AND (frontpage = 1)", | |
|
|
18 | - :order => "created_at DESC") | |
|
|
11 | + def self.frontpage | |
|
|
12 | + where(published: 1).where(frontpage: 1).order(created_at: :desc) | |
|
|
19 | 13 | end |
|
|
20 | 14 | |
|
|
21 | 15 | end |
| @@ -3,6 +3,6 | |||
|
|
3 | 3 | has_and_belongs_to_many :users |
|
|
4 | 4 | has_and_belongs_to_many :problems |
|
|
5 | 5 | |
|
|
6 |
- scope :enabled, |
|
|
|
6 | + scope :enabled, -> { where(enabled: true) } | |
|
|
7 | 7 | |
|
|
8 | 8 | end |
| @@ -152,7 +152,7 | |||
|
|
152 | 152 | |
|
|
153 | 153 | def self.read_config |
|
|
154 | 154 | GraderConfiguration.config_cache = {} |
|
|
155 |
- GraderConfiguration. |
|
|
|
155 | + GraderConfiguration.all.each do |conf| | |
|
|
156 | 156 | key = conf.key |
|
|
157 | 157 | val = conf.value |
|
|
158 | 158 | GraderConfiguration.config_cache[key] = GraderConfiguration.convert_type(val,conf.value_type) |
| @@ -1,11 +1,7 | |||
|
|
1 | 1 | class GraderProcess < ActiveRecord::Base |
|
|
2 | 2 | |
|
|
3 | 3 | def self.find_by_host_and_pid(host,pid) |
|
|
4 |
- return GraderProcess. |
|
|
|
5 | - :conditions => { | |
|
|
6 | - :host => host, | |
|
|
7 | - :pid => pid | |
|
|
8 | - }) | |
|
|
4 | + return GraderProcess.where(host:host).where(pid: pid).first | |
|
|
9 | 5 | end |
|
|
10 | 6 | |
|
|
11 | 7 | def self.register(host,pid,mode) |
| @@ -27,20 +23,15 | |||
|
|
27 | 23 | end |
|
|
28 | 24 | |
|
|
29 | 25 | def self.find_running_graders |
|
|
30 | - GraderProcess.find(:all, | |
|
|
31 | - :conditions => {:terminated => 0}) | |
|
|
26 | + where(terminated: false) | |
|
|
32 | 27 | end |
|
|
33 | 28 | |
|
|
34 | 29 | def self.find_terminated_graders |
|
|
35 | - GraderProcess.find(:all, | |
|
|
36 | - :conditions => "`terminated`") | |
|
|
30 | + where(terminated: true) | |
|
|
37 | 31 | end |
|
|
38 | 32 | |
|
|
39 | 33 | def self.find_stalled_process |
|
|
40 | - GraderProcess.find(:all, | |
|
|
41 | - :conditions => ["(`terminated` = 0) AND active AND " + | |
|
|
42 | - "(updated_at < ?)", | |
|
|
43 | - Time.now.gmtime - GraderProcess.stalled_time]) | |
|
|
34 | + where(terminated: false).where(active: true).where("updated_at < ?",Time.now.gmtime - GraderProcess.stalled_time) | |
|
|
44 | 35 | end |
|
|
45 | 36 | |
|
|
46 | 37 | def report_active(task=nil) |
| @@ -4,7 +4,7 | |||
|
|
4 | 4 | |
|
|
5 | 5 | def self.cache_ext_hash |
|
|
6 | 6 | @@languages_by_ext = {} |
|
|
7 |
- Language. |
|
|
|
7 | + Language.all.each do |language| | |
|
|
8 | 8 | language.common_ext.split(',').each do |ext| |
|
|
9 | 9 | @@languages_by_ext[ext] = language |
|
|
10 | 10 | end |
| @@ -1,5 +1,4 | |||
|
|
1 | 1 | class Login < ActiveRecord::Base |
|
|
2 | 2 | belongs_to :user |
|
|
3 | 3 | |
|
|
4 | - attr_accessible :ip_address, :logged_in_at, :user_id | |
|
|
5 | 4 | end |
| @@ -23,10 +23,8 | |||
|
|
23 | 23 | end |
|
|
24 | 24 | |
|
|
25 | 25 | def self.find_all_system_unreplied_messages |
|
|
26 | - self.find(:all, | |
|
|
27 | - :conditions => 'ISNULL(receiver_id) ' + | |
|
|
28 | - 'AND (ISNULL(replied) OR replied=0)', | |
|
|
29 | - :order => 'created_at') | |
|
|
26 | + where('ISNULL(receiver_id) ' + | |
|
|
27 | + 'AND (ISNULL(replied) OR replied=0)') | |
|
|
30 | 28 | end |
|
|
31 | 29 | |
|
|
32 | 30 | def self.build_replying_message_hierarchy(*args) |
| @@ -6,16 +6,17 | |||
|
|
6 | 6 | has_many :testcases, :dependent => :destroy |
|
|
7 | 7 | |
|
|
8 | 8 | validates_presence_of :name |
|
|
9 |
- validates_format_of :name, :with => / |
|
|
|
9 | + validates_format_of :name, :with => /\A\w+\z/ | |
|
|
10 | 10 | validates_presence_of :full_name |
|
|
11 | 11 | |
|
|
12 |
- scope :available, |
|
|
|
12 | + scope :available, -> { where(available: true) } | |
|
|
13 | 13 | |
|
|
14 | 14 | DEFAULT_TIME_LIMIT = 1 |
|
|
15 | 15 | DEFAULT_MEMORY_LIMIT = 32 |
|
|
16 | 16 | |
|
|
17 |
- def self. |
|
|
|
18 |
- |
|
|
|
17 | + def self.available_problems | |
|
|
18 | + available.order(date_added: :desc).order(:name) | |
|
|
19 | + #Problem.available.all(:order => "date_added DESC, name ASC") | |
|
|
19 | 20 | end |
|
|
20 | 21 | |
|
|
21 | 22 | def self.create_from_import_form_params(params, old_problem=nil) |
| @@ -16,11 +16,7 | |||
|
|
16 | 16 | before_save :assign_latest_number_if_new_recond |
|
|
17 | 17 | |
|
|
18 | 18 | def self.find_last_by_user_and_problem(user_id, problem_id) |
|
|
19 | - last_sub = find(:first, | |
|
|
20 | - :conditions => {:user_id => user_id, | |
|
|
21 | - :problem_id => problem_id}, | |
|
|
22 | - :order => 'number DESC') | |
|
|
23 | - return last_sub | |
|
|
19 | + where("user_id = ? AND problem_id = ?",user_id,problem_id).last | |
|
|
24 | 20 | end |
|
|
25 | 21 | |
|
|
26 | 22 | def self.find_all_last_by_problem(problem_id) |
| @@ -43,7 +39,7 | |||
|
|
43 | 39 | |
|
|
44 | 40 | def self.find_last_for_all_available_problems(user_id) |
|
|
45 | 41 | submissions = Array.new |
|
|
46 |
- problems = Problem. |
|
|
|
42 | + problems = Problem.available_problems | |
|
|
47 | 43 | problems.each do |problem| |
|
|
48 | 44 | sub = Submission.find_last_by_user_and_problem(user_id, problem.id) |
|
|
49 | 45 | submissions << sub if sub!=nil |
| @@ -52,20 +48,11 | |||
|
|
52 | 48 | end |
|
|
53 | 49 | |
|
|
54 | 50 | def self.find_by_user_problem_number(user_id, problem_id, number) |
|
|
55 | - Submission.find(:first, | |
|
|
56 | - :conditions => { | |
|
|
57 | - :user_id => user_id, | |
|
|
58 | - :problem_id => problem_id, | |
|
|
59 | - :number => number | |
|
|
60 | - }) | |
|
|
51 | + where("user_id = ? AND problem_id = ? AND number = ?",user_id,problem_id,number).first | |
|
|
61 | 52 | end |
|
|
62 | 53 | |
|
|
63 | 54 | def self.find_all_by_user_problem(user_id, problem_id) |
|
|
64 | - Submission.find(:all, | |
|
|
65 | - :conditions => { | |
|
|
66 | - :user_id => user_id, | |
|
|
67 | - :problem_id => problem_id, | |
|
|
68 | - }) | |
|
|
55 | + where("user_id = ? AND problem_id = ?",user_id,problem_id) | |
|
|
69 | 56 | end |
|
|
70 | 57 | |
|
|
71 | 58 | def download_filename |
| @@ -1,3 +1,3 | |||
|
|
1 | 1 | class SubmissionViewLog < ActiveRecord::Base |
|
|
2 | - attr_accessible :submission_id, :user_id | |
|
|
2 | + #attr_accessible :submission_id, :user_id | |
|
|
3 | 3 | end |
| @@ -48,10 +48,7 | |||
|
|
48 | 48 | task = nil |
|
|
49 | 49 | begin |
|
|
50 | 50 | Task.transaction do |
|
|
51 | - task = Task.find(:first, | |
|
|
52 | - :order => "created_at", | |
|
|
53 | - :conditions => {:status=> Task::STATUS_INQUEUE}, | |
|
|
54 | - :lock => true) | |
|
|
51 | + task = Task.where(status: Task::STATUS_INQUEUE).where(lock: true).first | |
|
|
55 | 52 | if task!=nil |
|
|
56 | 53 | task.status = status |
|
|
57 | 54 | task.save! |
| @@ -16,8 +16,7 | |||
|
|
16 | 16 | require 'fileutils' |
|
|
17 | 17 | |
|
|
18 | 18 | class TestRequest < Task |
|
|
19 | - | |
|
|
20 | - set_table_name "test_requests" | |
|
|
19 | + self.table_name = "test_requests" | |
|
|
21 | 20 | |
|
|
22 | 21 | belongs_to :user |
|
|
23 | 22 | belongs_to :problem |
| @@ -38,9 +37,7 | |||
|
|
38 | 37 | # since there will be only one grader grading TestRequest |
|
|
39 | 38 | # we do not need locking (hopefully) |
|
|
40 | 39 | |
|
|
41 |
- test_request = TestRequest. |
|
|
|
42 | - :order => "created_at", | |
|
|
43 | - :conditions => {:status=> Task::STATUS_INQUEUE}) | |
|
|
40 | + test_request = TestRequest.where(status: Task::STATUS_INQUEUE).first | |
|
|
44 | 41 | if test_request!=nil |
|
|
45 | 42 | test_request.status = status |
|
|
46 | 43 | test_request.save! |
| @@ -1,4 +1,4 | |||
|
|
1 | 1 | class Testcase < ActiveRecord::Base |
|
|
2 | 2 | belongs_to :problem |
|
|
3 | - attr_accessible :group, :input, :num, :score, :sol | |
|
|
3 | + #attr_accessible :group, :input, :num, :score, :sol | |
|
|
4 | 4 | end |
| @@ -8,30 +8,28 | |||
|
|
8 | 8 | |
|
|
9 | 9 | has_and_belongs_to_many :roles |
|
|
10 | 10 | |
|
|
11 |
- has_many :test_requests, |
|
|
|
11 | + has_many :test_requests, -> {order(submitted_at: DESC)} | |
|
|
12 | 12 | |
|
|
13 | - has_many :messages, | |
|
|
13 | + has_many :messages, -> { order(created_at: DESC) }, | |
|
|
14 | 14 | :class_name => "Message", |
|
|
15 |
- :foreign_key => "sender_id" |
|
|
|
16 | - :order => 'created_at DESC' | |
|
|
15 | + :foreign_key => "sender_id" | |
|
|
17 | 16 | |
|
|
18 | - has_many :replied_messages, | |
|
|
17 | + has_many :replied_messages, -> { order(created_at: DESC) }, | |
|
|
19 | 18 | :class_name => "Message", |
|
|
20 |
- :foreign_key => "receiver_id" |
|
|
|
21 | - :order => 'created_at DESC' | |
|
|
19 | + :foreign_key => "receiver_id" | |
|
|
22 | 20 | |
|
|
23 | 21 | has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy |
|
|
24 | 22 | |
|
|
25 | 23 | belongs_to :site |
|
|
26 | 24 | belongs_to :country |
|
|
27 | 25 | |
|
|
28 |
- has_and_belongs_to_many :contests, |
|
|
|
26 | + has_and_belongs_to_many :contests, -> { order(:name); uniq} | |
|
|
29 | 27 | |
|
|
30 |
- scope :activated_users, |
|
|
|
28 | + scope :activated_users, -> {where activated: true} | |
|
|
31 | 29 | |
|
|
32 | 30 | validates_presence_of :login |
|
|
33 | 31 | validates_uniqueness_of :login |
|
|
34 |
- validates_format_of :login, :with => / |
|
|
|
32 | + validates_format_of :login, :with => /\A[\_A-Za-z0-9]+\z/ | |
|
|
35 | 33 | validates_length_of :login, :within => 3..30 |
|
|
36 | 34 | |
|
|
37 | 35 | validates_presence_of :full_name |
| @@ -177,14 +175,14 | |||
|
|
177 | 175 | end |
|
|
178 | 176 | |
|
|
179 | 177 | def self.find_non_admin_with_prefix(prefix='') |
|
|
180 |
- users = User. |
|
|
|
178 | + users = User.all | |
|
|
181 | 179 | return users.find_all { |u| !(u.admin?) and u.login.index(prefix)==0 } |
|
|
182 | 180 | end |
|
|
183 | 181 | |
|
|
184 | 182 | # Contest information |
|
|
185 | 183 | |
|
|
186 | 184 | def self.find_users_with_no_contest() |
|
|
187 |
- users = User. |
|
|
|
185 | + users = User.all | |
|
|
188 | 186 | return users.find_all { |u| u.contests.length == 0 } |
|
|
189 | 187 | end |
|
|
190 | 188 | |
| @@ -283,7 +281,7 | |||
|
|
283 | 281 | |
|
|
284 | 282 | def available_problems |
|
|
285 | 283 | if not GraderConfiguration.multicontests? |
|
|
286 |
- return Problem. |
|
|
|
284 | + return Problem.available_problems | |
|
|
287 | 285 | else |
|
|
288 | 286 | contest_problems = [] |
|
|
289 | 287 | pin = {} |
| @@ -6,21 +6,21 | |||
|
|
6 | 6 | = t 'main.submitted_at' |
|
|
7 | 7 | = format_short_time(submission.submitted_at.localtime) |
|
|
8 | 8 | - else |
|
|
9 | - = t 'main.graded_at' | |
|
|
10 |
- = "#{format_short_time(submission.graded_at.localtime)} |
|
|
|
9 | + %strong= t 'main.graded_at' | |
|
|
10 | + = "#{format_short_time(submission.graded_at.localtime)} " | |
|
|
11 | + %br | |
|
|
11 | 12 | - if GraderConfiguration['ui.show_score'] |
|
|
12 |
- = |
|
|
|
13 | + %strong=t 'main.score' | |
|
|
13 | 14 | = "#{(submission.points*100/submission.problem.full_score).to_i} " |
|
|
14 | 15 | = " [" |
|
|
15 | 16 | %tt |
|
|
16 | 17 | = submission.grader_comment |
|
|
17 | 18 | = "]" |
|
|
19 | + %br | |
|
|
20 | + %strong View: | |
|
|
18 | 21 | - if GraderConfiguration.show_grading_result |
|
|
19 | - = " | " | |
|
|
20 | 22 | = link_to '[detailed result]', :action => 'result', :id => submission.id |
|
|
21 | - = " | " | |
|
|
22 | - = link_to("[#{t 'main.cmp_msg'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true}) | |
|
|
23 | - = " | " | |
|
|
24 | - = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id}) | |
|
|
25 | - //= " | " | |
|
|
26 | - //= link_to "[#{t 'main.submissions_link'}]", main_submission_path(submission.problem.id) | |
|
|
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.src_link'}", download_submission_path(submission.id), class: 'btn btn-xs btn-info' | |
|
|
25 | + = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info' | |
|
|
26 | + | |
| @@ -20,7 +20,8 | |||
|
|
20 | 20 | %strong View: |
|
|
21 | 21 | - if GraderConfiguration.show_grading_result |
|
|
22 | 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 | 25 | = link_to "#{t 'main.src_link'}",{:action => 'source', :id => submission.id}, class: 'btn btn-xs btn-info' |
|
|
25 | 26 | = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info' |
|
|
26 | 27 | |
| @@ -17,7 +17,7 | |||
|
|
17 | 17 | - total,num_passed = 0,0 |
|
|
18 | 18 | - sc.each_index do |i| |
|
|
19 | 19 | - if i == 0 |
|
|
20 |
- %td= link_to sc[i].login, |
|
|
|
20 | + %td= link_to sc[i].login, stat_user_path(sc[i]) | |
|
|
21 | 21 | %td= sc[i].full_name |
|
|
22 | 22 | / %td= sc[i].activated |
|
|
23 | 23 | / %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no' |
| @@ -28,10 +28,11 | |||
|
|
28 | 28 | .panel.panel-info |
|
|
29 | 29 | .panel-heading |
|
|
30 | 30 | Latest Submission Status |
|
|
31 | + = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true | |
|
|
31 | 32 | .panel-body |
|
|
32 | 33 | - if @submission |
|
|
33 | 34 | = render :partial => 'submission_short', |
|
|
34 |
- :locals => { |
|
|
|
35 | + :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id } | |
|
|
35 | 36 | .row |
|
|
36 | 37 | .col-md-12 |
|
|
37 | 38 | %h2 Console |
| @@ -85,6 +85,12 | |||
|
|
85 | 85 | %td |
|
|
86 | 86 | %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}} |
|
|
87 | 87 | view |
|
|
88 | + - if session[:admin] | |
|
|
89 | + %tr | |
|
|
90 | + %td.text-right | |
|
|
91 | + %strong IP | |
|
|
92 | + %td #{@submission.ip_address} | |
|
|
93 | + | |
|
|
88 | 94 |
|
|
|
89 | 95 |
|
|
|
90 | 96 |
|
| @@ -93,11 +99,6 | |||
|
|
93 | 99 |
|
|
|
94 | 100 |
|
|
|
95 | 101 |
|
|
|
96 |
- |
|
|
|
102 | + %pre#compiler_msg= @submission.compiler_message | |
|
|
97 | 103 |
|
|
|
98 | 104 |
|
|
|
99 | - - if session[:admin] | |
|
|
100 | - %tr | |
|
|
101 | - %td.text-right | |
|
|
102 | - %strong IP | |
|
|
103 | - %td #{@submission.ip_address} | |
| @@ -6,8 +6,8 | |||
|
|
6 | 6 | # since you don't have to restart the web server when you make code changes. |
|
|
7 | 7 | config.cache_classes = false |
|
|
8 | 8 | |
|
|
9 | - # Log error messages when you accidentally call methods on nil. | |
|
|
10 | - config.whiny_nils = true | |
|
|
9 | + # Log error messages when you accidentally call methods on nil. //DEPRICATED | |
|
|
10 | + # config.whiny_nils = true // DEPRICATED | |
|
|
11 | 11 | |
|
|
12 | 12 | # Show full error reports and disable caching |
|
|
13 | 13 | config.consider_all_requests_local = true |
| @@ -23,11 +23,11 | |||
|
|
23 | 23 | config.action_dispatch.best_standards_support = :builtin |
|
|
24 | 24 | |
|
|
25 | 25 | # Raise exception on mass assignment protection for Active Record models |
|
|
26 | - config.active_record.mass_assignment_sanitizer = :strict | |
|
|
26 | + # config.active_record.mass_assignment_sanitizer = :strict //DEPRICATED | |
|
|
27 | 27 | |
|
|
28 | - # Log the query plan for queries taking more than this (works | |
|
|
29 | - # with SQLite, MySQL, and PostgreSQL) | |
|
|
30 | - config.active_record.auto_explain_threshold_in_seconds = 0.5 | |
|
|
28 | + # Log the query plan for queries taking more than this (works // DEPRICATED | |
|
|
29 | + # with SQLite, MySQL, and PostgreSQL) // DEPRICATED | |
|
|
30 | + # config.active_record.auto_explain_threshold_in_seconds = 0.5 // DEPRICATED | |
|
|
31 | 31 | |
|
|
32 | 32 | # Do not compress assets |
|
|
33 | 33 | config.assets.compress = false |
| @@ -36,5 +36,7 | |||
|
|
36 | 36 | config.assets.debug = true |
|
|
37 | 37 | |
|
|
38 | 38 | # Prevents assets from rendering twice |
|
|
39 |
- config.serve_static_ |
|
|
|
39 | + config.serve_static_files = true | |
|
|
40 | + | |
|
|
41 | + config.eager_load = false | |
|
|
40 | 42 | end |
| @@ -9,7 +9,7 | |||
|
|
9 | 9 | config.action_controller.perform_caching = true |
|
|
10 | 10 | |
|
|
11 | 11 | # Disable Rails's static asset server (Apache or nginx will already do this) |
|
|
12 |
- config.serve_static_ |
|
|
|
12 | + config.serve_static_files = false | |
|
|
13 | 13 | |
|
|
14 | 14 | # Compress JavaScripts and CSS |
|
|
15 | 15 | config.assets.compress = true |
| @@ -64,4 +64,6 | |||
|
|
64 | 64 | # Log the query plan for queries taking more than this (works |
|
|
65 | 65 | # with SQLite, MySQL, and PostgreSQL) |
|
|
66 | 66 | # config.active_record.auto_explain_threshold_in_seconds = 0.5 |
|
|
67 | + | |
|
|
68 | + config.eager_load = true | |
|
|
67 | 69 | end |
| @@ -8,7 +8,7 | |||
|
|
8 | 8 | config.cache_classes = true |
|
|
9 | 9 | |
|
|
10 | 10 | # Configure static asset server for tests with Cache-Control for performance |
|
|
11 |
- config.serve_static_ |
|
|
|
11 | + config.serve_static_files = true | |
|
|
12 | 12 | config.static_cache_control = "public, max-age=3600" |
|
|
13 | 13 | |
|
|
14 | 14 | # Log error messages when you accidentally call methods on nil |
| @@ -30,8 +30,14 | |||
|
|
30 | 30 | config.action_mailer.delivery_method = :test |
|
|
31 | 31 | |
|
|
32 | 32 | # Raise exception on mass assignment protection for Active Record models |
|
|
33 | - config.active_record.mass_assignment_sanitizer = :strict | |
|
|
33 | + #config.active_record.mass_assignment_sanitizer = :strict // DEPRICATED | |
|
|
34 | 34 | |
|
|
35 | 35 | # Print deprecation notices to the stderr |
|
|
36 | 36 | config.active_support.deprecation = :stderr |
|
|
37 | + | |
|
|
38 | + config.eager_load = false | |
|
|
39 | + | |
|
|
40 | + #test order | |
|
|
41 | + config.active_support.test_order = :sorted | |
|
|
42 | + | |
|
|
37 | 43 | end |
| @@ -3,4 +3,3 | |||
|
|
3 | 3 | # Add new mime types for use in respond_to blocks: |
|
|
4 | 4 | # Mime::Type.register "text/richtext", :rtf |
|
|
5 | 5 | # Mime::Type.register_alias "text/html", :iphone |
|
|
6 | - Mime::Type.register 'application/pdf', :pdf | |
| @@ -37,6 +37,10 | |||
|
|
37 | 37 | end |
|
|
38 | 38 | |
|
|
39 | 39 | resources :submissions do |
|
|
40 | + member do | |
|
|
41 | + get 'download' | |
|
|
42 | + get 'compiler_msg' | |
|
|
43 | + end | |
|
|
40 | 44 | collection do |
|
|
41 | 45 | get 'prob/:problem_id', to: 'submissions#index', as: 'problem' |
|
|
42 | 46 | get 'direct_edit_problem/:problem_id', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem' |
| @@ -44,9 +48,9 | |||
|
|
44 | 48 | end |
|
|
45 | 49 | end |
|
|
46 | 50 | |
|
|
47 |
- |
|
|
|
48 |
- |
|
|
|
49 |
- |
|
|
|
51 | + get 'tasks/view/:file.:ext' => 'tasks#view' | |
|
|
52 | + get 'tasks/download/:id/:file.:ext' => 'tasks#download' | |
|
|
53 | + get 'heartbeat/:id/edit' => 'heartbeat#edit' | |
|
|
50 | 54 | |
|
|
51 | 55 | #main |
|
|
52 | 56 | get "main/list" |
| @@ -63,11 +67,11 | |||
|
|
63 | 67 | get 'graders/list', to: 'graders#list', as: 'grader_list' |
|
|
64 | 68 | |
|
|
65 | 69 | |
|
|
66 |
- |
|
|
|
70 | + get 'heartbeat/:id/edit' => 'heartbeat#edit' | |
|
|
67 | 71 | |
|
|
68 | 72 | # See how all your routes lay out with "rake routes" |
|
|
69 | 73 | |
|
|
70 | 74 | # This is a legacy wild controller route that's not recommended for RESTful applications. |
|
|
71 | 75 | # Note: This route will make all actions in every controller accessible via GET requests. |
|
|
72 | - match ':controller(/:action(/:id))(.:format)' | |
|
|
76 | + match ':controller(/:action(/:id))(.:format)', via: [:get, :post] | |
|
|
73 | 77 | end |
| @@ -9,112 +9,112 | |||
|
|
9 | 9 | # from scratch. The latter is a flawed and unsustainable approach (the more migrations |
|
|
10 | 10 | # you'll amass, the slower it'll run and the greater likelihood for issues). |
|
|
11 | 11 | # |
|
|
12 | - # It's strongly recommended to check this file into your version control system. | |
|
|
12 | + # It's strongly recommended that you check this file into your version control system. | |
|
|
13 | 13 | |
|
|
14 |
- ActiveRecord::Schema.define( |
|
|
|
14 | + ActiveRecord::Schema.define(version: 20161031063337) do | |
|
|
15 | 15 | |
|
|
16 |
- create_table "announcements", |
|
|
|
16 | + create_table "announcements", force: :cascade do |t| | |
|
|
17 | 17 | t.string "author" |
|
|
18 | 18 | t.text "body" |
|
|
19 | 19 | t.boolean "published" |
|
|
20 |
- t.datetime "created_at", |
|
|
|
21 |
- t.datetime "updated_at", |
|
|
|
22 |
- t.boolean "frontpage", |
|
|
|
23 |
- t.boolean "contest_only", |
|
|
|
20 | + t.datetime "created_at", null: false | |
|
|
21 | + t.datetime "updated_at", null: false | |
|
|
22 | + t.boolean "frontpage", default: false | |
|
|
23 | + t.boolean "contest_only", default: false | |
|
|
24 | 24 | t.string "title" |
|
|
25 | 25 | t.string "notes" |
|
|
26 | 26 | end |
|
|
27 | 27 | |
|
|
28 |
- create_table "contests", |
|
|
|
28 | + create_table "contests", force: :cascade do |t| | |
|
|
29 | 29 | t.string "title" |
|
|
30 | 30 | t.boolean "enabled" |
|
|
31 |
- t.datetime "created_at", |
|
|
|
32 |
- t.datetime "updated_at", |
|
|
|
31 | + t.datetime "created_at", null: false | |
|
|
32 | + t.datetime "updated_at", null: false | |
|
|
33 | 33 | t.string "name" |
|
|
34 | 34 | end |
|
|
35 | 35 | |
|
|
36 |
- create_table "contests_problems", |
|
|
|
36 | + create_table "contests_problems", id: false, force: :cascade do |t| | |
|
|
37 | 37 | t.integer "contest_id" |
|
|
38 | 38 | t.integer "problem_id" |
|
|
39 | 39 | end |
|
|
40 | 40 | |
|
|
41 |
- create_table "contests_users", |
|
|
|
41 | + create_table "contests_users", id: false, force: :cascade do |t| | |
|
|
42 | 42 | t.integer "contest_id" |
|
|
43 | 43 | t.integer "user_id" |
|
|
44 | 44 | end |
|
|
45 | 45 | |
|
|
46 |
- create_table "countries", |
|
|
|
46 | + create_table "countries", force: :cascade do |t| | |
|
|
47 | 47 | t.string "name" |
|
|
48 |
- t.datetime "created_at", |
|
|
|
49 |
- t.datetime "updated_at", |
|
|
|
48 | + t.datetime "created_at", null: false | |
|
|
49 | + t.datetime "updated_at", null: false | |
|
|
50 | 50 | end |
|
|
51 | 51 | |
|
|
52 |
- create_table "descriptions", |
|
|
|
52 | + create_table "descriptions", force: :cascade do |t| | |
|
|
53 | 53 | t.text "body" |
|
|
54 | 54 | t.boolean "markdowned" |
|
|
55 |
- t.datetime "created_at", |
|
|
|
56 |
- t.datetime "updated_at", |
|
|
|
55 | + t.datetime "created_at", null: false | |
|
|
56 | + t.datetime "updated_at", null: false | |
|
|
57 | 57 | end |
|
|
58 | 58 | |
|
|
59 |
- create_table "grader_configurations", |
|
|
|
59 | + create_table "grader_configurations", force: :cascade do |t| | |
|
|
60 | 60 | t.string "key" |
|
|
61 | 61 | t.string "value_type" |
|
|
62 | 62 | t.string "value" |
|
|
63 |
- t.datetime "created_at", |
|
|
|
64 |
- t.datetime "updated_at", |
|
|
|
63 | + t.datetime "created_at", null: false | |
|
|
64 | + t.datetime "updated_at", null: false | |
|
|
65 | 65 | t.text "description" |
|
|
66 | 66 | end |
|
|
67 | 67 | |
|
|
68 |
- create_table "grader_processes", |
|
|
|
68 | + create_table "grader_processes", force: :cascade do |t| | |
|
|
69 | 69 | t.string "host" |
|
|
70 | 70 | t.integer "pid" |
|
|
71 | 71 | t.string "mode" |
|
|
72 | 72 | t.boolean "active" |
|
|
73 |
- t.datetime "created_at", |
|
|
|
74 |
- t.datetime "updated_at", |
|
|
|
73 | + t.datetime "created_at", null: false | |
|
|
74 | + t.datetime "updated_at", null: false | |
|
|
75 | 75 | t.integer "task_id" |
|
|
76 | 76 | t.string "task_type" |
|
|
77 | 77 | t.boolean "terminated" |
|
|
78 | 78 | end |
|
|
79 | 79 | |
|
|
80 |
- add_index "grader_processes", ["host", "pid"], |
|
|
|
80 | + add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid" | |
|
|
81 | 81 | |
|
|
82 |
- create_table "heart_beats", |
|
|
|
82 | + create_table "heart_beats", force: :cascade do |t| | |
|
|
83 | 83 | t.integer "user_id" |
|
|
84 | 84 | t.string "ip_address" |
|
|
85 |
- t.datetime "created_at", |
|
|
|
86 |
- t.datetime "updated_at", |
|
|
|
85 | + t.datetime "created_at", null: false | |
|
|
86 | + t.datetime "updated_at", null: false | |
|
|
87 | 87 | t.string "status" |
|
|
88 | 88 | end |
|
|
89 | 89 | |
|
|
90 |
- add_index "heart_beats", ["updated_at"], |
|
|
|
90 | + add_index "heart_beats", ["updated_at"], name: "index_heart_beats_on_updated_at" | |
|
|
91 | 91 | |
|
|
92 |
- create_table "languages", |
|
|
|
93 |
- t.string "name", |
|
|
|
92 | + create_table "languages", force: :cascade do |t| | |
|
|
93 | + t.string "name", limit: 10 | |
|
|
94 | 94 | t.string "pretty_name" |
|
|
95 |
- t.string "ext", |
|
|
|
95 | + t.string "ext", limit: 10 | |
|
|
96 | 96 | t.string "common_ext" |
|
|
97 | 97 | end |
|
|
98 | 98 | |
|
|
99 |
- create_table "logins", |
|
|
|
99 | + create_table "logins", force: :cascade do |t| | |
|
|
100 | 100 | t.integer "user_id" |
|
|
101 | 101 | t.string "ip_address" |
|
|
102 |
- t.datetime "created_at", |
|
|
|
103 |
- t.datetime "updated_at", |
|
|
|
102 | + t.datetime "created_at", null: false | |
|
|
103 | + t.datetime "updated_at", null: false | |
|
|
104 | 104 | end |
|
|
105 | 105 | |
|
|
106 |
- create_table "messages", |
|
|
|
106 | + create_table "messages", force: :cascade do |t| | |
|
|
107 | 107 | t.integer "sender_id" |
|
|
108 | 108 | t.integer "receiver_id" |
|
|
109 | 109 | t.integer "replying_message_id" |
|
|
110 | 110 | t.text "body" |
|
|
111 | 111 | t.boolean "replied" |
|
|
112 |
- t.datetime "created_at", |
|
|
|
113 |
- t.datetime "updated_at", |
|
|
|
112 | + t.datetime "created_at", null: false | |
|
|
113 | + t.datetime "updated_at", null: false | |
|
|
114 | 114 | end |
|
|
115 | 115 | |
|
|
116 |
- create_table "problems", |
|
|
|
117 |
- t.string "name", |
|
|
|
116 | + create_table "problems", force: :cascade do |t| | |
|
|
117 | + t.string "name", limit: 30 | |
|
|
118 | 118 | t.string "full_name" |
|
|
119 | 119 | t.integer "full_score" |
|
|
120 | 120 | t.date "date_added" |
| @@ -126,57 +126,57 | |||
|
|
126 | 126 | t.string "description_filename" |
|
|
127 | 127 | end |
|
|
128 | 128 | |
|
|
129 |
- create_table "rights", |
|
|
|
129 | + create_table "rights", force: :cascade do |t| | |
|
|
130 | 130 | t.string "name" |
|
|
131 | 131 | t.string "controller" |
|
|
132 | 132 | t.string "action" |
|
|
133 | 133 | end |
|
|
134 | 134 | |
|
|
135 |
- create_table "rights_roles", |
|
|
|
135 | + create_table "rights_roles", id: false, force: :cascade do |t| | |
|
|
136 | 136 | t.integer "right_id" |
|
|
137 | 137 | t.integer "role_id" |
|
|
138 | 138 | end |
|
|
139 | 139 | |
|
|
140 |
- add_index "rights_roles", ["role_id"], |
|
|
|
140 | + add_index "rights_roles", ["role_id"], name: "index_rights_roles_on_role_id" | |
|
|
141 | 141 | |
|
|
142 |
- create_table "roles", |
|
|
|
142 | + create_table "roles", force: :cascade do |t| | |
|
|
143 | 143 | t.string "name" |
|
|
144 | 144 | end |
|
|
145 | 145 | |
|
|
146 |
- create_table "roles_users", |
|
|
|
146 | + create_table "roles_users", id: false, force: :cascade do |t| | |
|
|
147 | 147 | t.integer "role_id" |
|
|
148 | 148 | t.integer "user_id" |
|
|
149 | 149 | end |
|
|
150 | 150 | |
|
|
151 |
- add_index "roles_users", ["user_id"], |
|
|
|
151 | + add_index "roles_users", ["user_id"], name: "index_roles_users_on_user_id" | |
|
|
152 | 152 | |
|
|
153 |
- create_table "sessions", |
|
|
|
153 | + create_table "sessions", force: :cascade do |t| | |
|
|
154 | 154 | t.string "session_id" |
|
|
155 | 155 | t.text "data" |
|
|
156 | 156 | t.datetime "updated_at" |
|
|
157 | 157 | end |
|
|
158 | 158 | |
|
|
159 |
- add_index "sessions", ["session_id"], |
|
|
|
160 |
- add_index "sessions", ["updated_at"], |
|
|
|
159 | + add_index "sessions", ["session_id"], name: "index_sessions_on_session_id" | |
|
|
160 | + add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at" | |
|
|
161 | 161 | |
|
|
162 |
- create_table "sites", |
|
|
|
162 | + create_table "sites", force: :cascade do |t| | |
|
|
163 | 163 | t.string "name" |
|
|
164 | 164 | t.boolean "started" |
|
|
165 | 165 | t.datetime "start_time" |
|
|
166 |
- t.datetime "created_at", |
|
|
|
167 |
- t.datetime "updated_at", |
|
|
|
166 | + t.datetime "created_at", null: false | |
|
|
167 | + t.datetime "updated_at", null: false | |
|
|
168 | 168 | t.integer "country_id" |
|
|
169 | 169 | t.string "password" |
|
|
170 | 170 | end |
|
|
171 | 171 | |
|
|
172 |
- create_table "submission_view_logs", |
|
|
|
172 | + create_table "submission_view_logs", force: :cascade do |t| | |
|
|
173 | 173 | t.integer "user_id" |
|
|
174 | 174 | t.integer "submission_id" |
|
|
175 |
- t.datetime "created_at", |
|
|
|
176 |
- t.datetime "updated_at", |
|
|
|
175 | + t.datetime "created_at", null: false | |
|
|
176 | + t.datetime "updated_at", null: false | |
|
|
177 | 177 | end |
|
|
178 | 178 | |
|
|
179 |
- create_table "submissions", |
|
|
|
179 | + create_table "submissions", force: :cascade do |t| | |
|
|
180 | 180 | t.integer "user_id" |
|
|
181 | 181 | t.integer "problem_id" |
|
|
182 | 182 | t.integer "language_id" |
| @@ -196,25 +196,25 | |||
|
|
196 | 196 | t.string "ip_address" |
|
|
197 | 197 | end |
|
|
198 | 198 | |
|
|
199 |
- add_index "submissions", ["user_id", "problem_id", "number"], |
|
|
|
200 |
- add_index "submissions", ["user_id", "problem_id"], |
|
|
|
199 | + add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true | |
|
|
200 | + add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id" | |
|
|
201 | 201 | |
|
|
202 |
- create_table "tasks", |
|
|
|
202 | + create_table "tasks", force: :cascade do |t| | |
|
|
203 | 203 | t.integer "submission_id" |
|
|
204 | 204 | t.datetime "created_at" |
|
|
205 | 205 | t.integer "status" |
|
|
206 | 206 | t.datetime "updated_at" |
|
|
207 | 207 | end |
|
|
208 | 208 | |
|
|
209 |
- create_table "test_pairs", |
|
|
|
209 | + create_table "test_pairs", force: :cascade do |t| | |
|
|
210 | 210 | t.integer "problem_id" |
|
|
211 |
- t.text "input", |
|
|
|
212 |
- t.text "solution", |
|
|
|
213 |
- t.datetime "created_at", |
|
|
|
214 |
- t.datetime "updated_at", |
|
|
|
211 | + t.text "input", limit: 16777215 | |
|
|
212 | + t.text "solution", limit: 16777215 | |
|
|
213 | + t.datetime "created_at", null: false | |
|
|
214 | + t.datetime "updated_at", null: false | |
|
|
215 | 215 | end |
|
|
216 | 216 | |
|
|
217 |
- create_table "test_requests", |
|
|
|
217 | + create_table "test_requests", force: :cascade do |t| | |
|
|
218 | 218 | t.integer "user_id" |
|
|
219 | 219 | t.integer "problem_id" |
|
|
220 | 220 | t.integer "submission_id" |
| @@ -222,59 +222,59 | |||
|
|
222 | 222 | t.string "output_file_name" |
|
|
223 | 223 | t.string "running_stat" |
|
|
224 | 224 | t.integer "status" |
|
|
225 |
- t.datetime "updated_at", |
|
|
|
225 | + t.datetime "updated_at", null: false | |
|
|
226 | 226 | t.datetime "submitted_at" |
|
|
227 | 227 | t.datetime "compiled_at" |
|
|
228 | 228 | t.text "compiler_message" |
|
|
229 | 229 | t.datetime "graded_at" |
|
|
230 | 230 | t.string "grader_comment" |
|
|
231 |
- t.datetime "created_at", |
|
|
|
231 | + t.datetime "created_at", null: false | |
|
|
232 | 232 | t.float "running_time" |
|
|
233 | 233 | t.string "exit_status" |
|
|
234 | 234 | t.integer "memory_usage" |
|
|
235 | 235 | end |
|
|
236 | 236 | |
|
|
237 |
- add_index "test_requests", ["user_id", "problem_id"], |
|
|
|
237 | + add_index "test_requests", ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id" | |
|
|
238 | 238 | |
|
|
239 |
- create_table "testcases", |
|
|
|
239 | + create_table "testcases", force: :cascade do |t| | |
|
|
240 | 240 | t.integer "problem_id" |
|
|
241 | 241 | t.integer "num" |
|
|
242 | 242 | t.integer "group" |
|
|
243 | 243 | t.integer "score" |
|
|
244 | 244 | t.text "input" |
|
|
245 | 245 | t.text "sol" |
|
|
246 |
- t.datetime "created_at", |
|
|
|
247 |
- t.datetime "updated_at", |
|
|
|
246 | + t.datetime "created_at", null: false | |
|
|
247 | + t.datetime "updated_at", null: false | |
|
|
248 | 248 | end |
|
|
249 | 249 | |
|
|
250 |
- add_index "testcases", ["problem_id"], |
|
|
|
250 | + add_index "testcases", ["problem_id"], name: "index_testcases_on_problem_id" | |
|
|
251 | 251 | |
|
|
252 |
- create_table "user_contest_stats", |
|
|
|
252 | + create_table "user_contest_stats", force: :cascade do |t| | |
|
|
253 | 253 | t.integer "user_id" |
|
|
254 | 254 | t.datetime "started_at" |
|
|
255 |
- t.datetime "created_at", |
|
|
|
256 |
- t.datetime "updated_at", |
|
|
|
255 | + t.datetime "created_at", null: false | |
|
|
256 | + t.datetime "updated_at", null: false | |
|
|
257 | 257 | t.boolean "forced_logout" |
|
|
258 | 258 | end |
|
|
259 | 259 | |
|
|
260 |
- create_table "users", |
|
|
|
261 |
- t.string "login", |
|
|
|
260 | + create_table "users", force: :cascade do |t| | |
|
|
261 | + t.string "login", limit: 50 | |
|
|
262 | 262 | t.string "full_name" |
|
|
263 | 263 | t.string "hashed_password" |
|
|
264 |
- t.string "salt", |
|
|
|
264 | + t.string "salt", limit: 5 | |
|
|
265 | 265 | t.string "alias" |
|
|
266 | 266 | t.string "email" |
|
|
267 | 267 | t.integer "site_id" |
|
|
268 | 268 | t.integer "country_id" |
|
|
269 |
- t.boolean "activated", |
|
|
|
269 | + t.boolean "activated", default: false | |
|
|
270 | 270 | t.datetime "created_at" |
|
|
271 | 271 | t.datetime "updated_at" |
|
|
272 |
- t.boolean "enabled", |
|
|
|
272 | + t.boolean "enabled", default: true | |
|
|
273 | 273 | t.string "remark" |
|
|
274 | 274 | t.string "last_ip" |
|
|
275 | 275 | t.string "section" |
|
|
276 | 276 | end |
|
|
277 | 277 | |
|
|
278 |
- add_index "users", ["login"], |
|
|
|
278 | + add_index "users", ["login"], name: "index_users_on_login", unique: true | |
|
|
279 | 279 | |
|
|
280 | 280 | end |
| @@ -53,6 +53,7 | |||
|
|
53 | 53 | :description => 'If the server is in contest mode and this option is true, on the log in of the admin a menu for site selections is shown.' |
|
|
54 | 54 | }, |
|
|
55 | 55 | |
|
|
56 | + #---------------------------- right -------------------------------- | |
|
|
56 | 57 | { |
|
|
57 | 58 | :key => 'right.user_hall_of_fame', |
|
|
58 | 59 | :value_type => 'boolean', |
| @@ -74,6 +75,20 | |||
|
|
74 | 75 | :description => 'If true, any user can view submissions of every one.' |
|
|
75 | 76 | }, |
|
|
76 | 77 | |
|
|
78 | + { | |
|
|
79 | + :key => 'right.bypass_agreement', | |
|
|
80 | + :value_type => 'boolean', | |
|
|
81 | + :default_value => 'true', | |
|
|
82 | + :description => 'When false, a user must accept usage agreement before login' | |
|
|
83 | + }, | |
|
|
84 | + | |
|
|
85 | + { | |
|
|
86 | + :key => 'right.heartbeat_response', | |
|
|
87 | + :value_type => 'string', | |
|
|
88 | + :default_value => 'OK', | |
|
|
89 | + :description => 'Heart beat response text' | |
|
|
90 | + }, | |
|
|
91 | + | |
|
|
77 | 92 | # If Configuration['system.online_registration'] is true, the |
|
|
78 | 93 | # system allows online registration, and will use these |
|
|
79 | 94 | # information for sending confirmation emails. |
| @@ -2,7 +2,7 | |||
|
|
2 | 2 | require File.expand_path(File.dirname(__FILE__) + "/../../config/environment") |
|
|
3 | 3 | |
|
|
4 | 4 | def clear_all_tasks |
|
|
5 |
- Task. |
|
|
|
5 | + Task.all.each do |task| | |
|
|
6 | 6 | task.destroy |
|
|
7 | 7 | end |
|
|
8 | 8 | end |
| @@ -2,13 +2,12 | |||
|
|
2 | 2 | require File.expand_path(File.dirname(__FILE__) + "/../../config/environment") |
|
|
3 | 3 | |
|
|
4 | 4 | def clear_all_tasks |
|
|
5 |
- Task. |
|
|
|
5 | + Task.all.each do |task| | |
|
|
6 | 6 | task.destroy |
|
|
7 | 7 | end |
|
|
8 | 8 | end |
|
|
9 | 9 | |
|
|
10 | - puts Task.find(:all, | |
|
|
11 | - :conditions => {:status => Task::STATUS_COMPLETE}).length | |
|
|
10 | + puts Task.where(status: Task::STATUS_COMPLETE).length | |
|
|
12 | 11 | |
|
|
13 | 12 | clear_all_tasks |
|
|
14 | 13 | |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
| deleted file |
You need to be logged in to leave comments.
Login now