Description:
add options to allow hall of fame viewing by any user
add menu item for normal user
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r424:217b94aa4f76 - - 6 files changed: 25 inserted, 12 deleted
| @@ -20,12 +20,16 | |||
|
|
20 | 20 | end |
|
|
21 | 21 | |
|
|
22 | 22 | protected |
|
|
23 | 23 | |
|
|
24 | 24 | def authenticate |
|
|
25 | 25 | unless session[:user_id] |
|
|
26 | + flash[:notice] = 'You need to login' | |
|
|
27 | + if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY] | |
|
|
28 | + flash[:notice] = 'You need to login but you cannot log in at this time' | |
|
|
29 | + end | |
|
|
26 | 30 | redirect_to :controller => 'main', :action => 'login' |
|
|
27 | 31 | return false |
|
|
28 | 32 | end |
|
|
29 | 33 | |
|
|
30 | 34 | # check if run in single user mode |
|
|
31 | 35 | if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY] |
| @@ -1,21 +1,17 | |||
|
|
1 | 1 | class ReportController < ApplicationController |
|
|
2 | 2 | |
|
|
3 | 3 | before_filter :admin_authorization, only: [:login_stat,:submission_stat] |
|
|
4 |
- before_filter |
|
|
|
5 | - user = User.find(session[:user_id]) if session[:user_id] | |
|
|
6 | - if user==nil | |
|
|
7 | - flash[:notice] = 'You have to login first' | |
|
|
8 | - redirect_to :controller => 'main', :action => 'login' | |
|
|
9 | - return false | |
|
|
4 | + before_filter { |c| | |
|
|
5 | + return false unless authenticate | |
|
|
6 | + | |
|
|
7 | + if GraderConfiguration["system.hall_of_fame_available"] | |
|
|
8 | + return true; | |
|
|
10 | 9 | end |
|
|
11 | 10 | |
|
|
12 | - unless GraderConfiguration["hall_of_fame_available"] | |
|
|
13 | - flash[:notice] = 'You are not authorized to view the page you requested' | |
|
|
14 | - redirect_to :controller => 'main', :action => 'login' unless GraderConfiguration[ "hall_of_fame_available" ] | |
|
|
15 | - end | |
|
|
11 | + admin_authorization | |
|
|
16 | 12 | } |
|
|
17 | 13 | |
|
|
18 | 14 | def login_stat |
|
|
19 | 15 | @logins = Array.new |
|
|
20 | 16 | |
|
|
21 | 17 | date_and_time = '%Y-%m-%d %H:%M' |
| @@ -27,12 +27,16 | |||
|
|
27 | 27 | |
|
|
28 | 28 | if (user!=nil) and (GraderConfiguration.show_tasks_to?(user)) |
|
|
29 | 29 | append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list' |
|
|
30 | 30 | append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission' |
|
|
31 | 31 | append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index' |
|
|
32 | 32 | end |
|
|
33 | + | |
|
|
34 | + if GraderConfiguration['system.hall_of_fame_available'] | |
|
|
35 | + append_to menu_items, "[#{I18n.t 'menu.hall_of_fame'}]", 'report', 'problem_hof' | |
|
|
36 | + end | |
|
|
33 | 37 | append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help' |
|
|
34 | 38 | |
|
|
35 | 39 | if GraderConfiguration['system.user_setting_enabled'] |
|
|
36 | 40 | append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index' |
|
|
37 | 41 | end |
|
|
38 | 42 | append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login' |
| @@ -17,12 +17,13 | |||
|
|
17 | 17 | menu: |
|
|
18 | 18 | main: 'Main' |
|
|
19 | 19 | messages: 'Messages' |
|
|
20 | 20 | tasks: 'Tasks' |
|
|
21 | 21 | submissions: 'Submissions' |
|
|
22 | 22 | test: 'Test Interface' |
|
|
23 | + hall_of_fame: 'Hall of Fame' | |
|
|
23 | 24 | help: 'Help' |
|
|
24 | 25 | settings: 'Settings' |
|
|
25 | 26 | log_out: 'Log out' |
|
|
26 | 27 | |
|
|
27 | 28 | title_bar: |
|
|
28 | 29 | current_time: "Current time is" |
| @@ -17,12 +17,13 | |||
|
|
17 | 17 | menu: |
|
|
18 | 18 | main: 'หน้าหลัก' |
|
|
19 | 19 | messages: 'ข้อความ' |
|
|
20 | 20 | tasks: 'โจทย์' |
|
|
21 | 21 | submissions: 'โปรแกรมที่ส่ง' |
|
|
22 | 22 | test: 'ทดสอบโปรแกรม' |
|
|
23 | + hall_of_fame: 'หอเกียรติยศ' | |
|
|
23 | 24 | help: 'ความช่วยเหลือ' |
|
|
24 | 25 | settings: 'เปลี่ยนรหัสผ่าน' |
|
|
25 | 26 | log_out: 'ออกจากระบบ' |
|
|
26 | 27 | |
|
|
27 | 28 | title_bar: |
|
|
28 | 29 | current_time: "เวลาปัจจุบันคือ" |
| @@ -51,16 +51,16 | |||
|
|
51 | 51 | :value_type => 'boolean', |
|
|
52 | 52 | :default_value => 'false', |
|
|
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 | 56 | { |
|
|
57 |
- :key => 'system. |
|
|
|
57 | + :key => 'system.hall_of_fame_available', | |
|
|
58 | 58 | :value_type => 'boolean', |
|
|
59 | 59 | :default_value => 'false', |
|
|
60 | - :description => 'This option enables online registration.' | |
|
|
60 | + :description => 'If true, any user can access hall of fame page.' | |
|
|
61 | 61 | }, |
|
|
62 | 62 | |
|
|
63 | 63 | # If Configuration['system.online_registration'] is true, the |
|
|
64 | 64 | # system allows online registration, and will use these |
|
|
65 | 65 | # information for sending confirmation emails. |
|
|
66 | 66 | { |
| @@ -85,12 +85,19 | |||
|
|
85 | 85 | :key => 'system.user_setting_enabled', |
|
|
86 | 86 | :value_type => 'boolean', |
|
|
87 | 87 | :default_value => 'true', |
|
|
88 | 88 | :description => 'If this option is true, users can change their settings' |
|
|
89 | 89 | }, |
|
|
90 | 90 | |
|
|
91 | + { | |
|
|
92 | + :key => 'system.user_setting_enabled', | |
|
|
93 | + :value_type => 'boolean', | |
|
|
94 | + :default_value => 'true', | |
|
|
95 | + :description => 'If this option is true, users can change their settings' | |
|
|
96 | + } | |
|
|
97 | + | |
|
|
91 | 98 | # If Configuration['contest.test_request.early_timeout'] is true |
|
|
92 | 99 | # the user will not be able to use test request at 30 minutes |
|
|
93 | 100 | # before the contest ends. |
|
|
94 | 101 | { |
|
|
95 | 102 | :key => 'contest.test_request.early_timeout', |
|
|
96 | 103 | :value_type => 'boolean', |
You need to be logged in to leave comments.
Login now