Description:
added 'user_setting_enabled' option
git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@295 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
jittat
-
r156:e751e4e9d100 - - 3 files changed: 16 inserted, 4 deleted
| @@ -1,30 +1,31 | |||
|
|
1 | 1 | class UsersController < ApplicationController |
|
|
2 | 2 | |
|
|
3 | - before_filter :authenticate | |
|
|
3 | + before_filter :authenticate, :except => [:new, :register] | |
|
|
4 | 4 | |
|
|
5 | 5 | verify :method => :post, :only => [:chg_passwd], |
|
|
6 | 6 | :redirect_to => { :action => :index } |
|
|
7 | 7 | |
|
|
8 | 8 | in_place_edit_for :user, :alias_for_editing |
|
|
9 | 9 | in_place_edit_for :user, :email_for_editing |
|
|
10 | 10 | |
|
|
11 | 11 | def index |
|
|
12 | - # uncomment below to disable settings | |
|
|
13 |
- |
|
|
|
14 | - | |
|
|
12 | + if !Configuration['system.user_setting_enabled'] | |
|
|
13 | + redirect_to :controller => 'main', :action => 'list' | |
|
|
14 | + else | |
|
|
15 | 15 | @user = User.find(session[:user_id]) |
|
|
16 | 16 | end |
|
|
17 | + end | |
|
|
17 | 18 | |
|
|
18 | 19 | def chg_passwd |
|
|
19 | 20 | user = User.find(session[:user_id]) |
|
|
20 | 21 | user.password = params[:passwd] |
|
|
21 | 22 | user.password_confirmation = params[:passwd_verify] |
|
|
22 | 23 | if user.save |
|
|
23 | 24 | flash[:notice] = 'password changed' |
|
|
24 | 25 | else |
|
|
25 | 26 | flash[:notice] = 'Error: password changing failed' |
|
|
26 | 27 | end |
|
|
27 | 28 | redirect_to :action => 'index' |
|
|
28 | 29 | end |
|
|
29 | 30 | |
|
|
30 | 31 | end |
| @@ -9,49 +9,52 | |||
|
|
9 | 9 | |
|
|
10 | 10 | if (user!=nil) and (session[:admin]) |
|
|
11 | 11 | # admin menu |
|
|
12 | 12 | menu_items << "<b>Administrative task:</b> " |
|
|
13 | 13 | append_to menu_items, '[Announcements]', 'announcements', 'index' |
|
|
14 | 14 | append_to menu_items, '[Msg console]', 'messages', 'console' |
|
|
15 | 15 | append_to menu_items, '[Problem admin]', 'problems', 'index' |
|
|
16 | 16 | append_to menu_items, '[User admin]', 'user_admin', 'index' |
|
|
17 | 17 | append_to menu_items, '[User stat]', 'user_admin', 'user_stat' |
|
|
18 | 18 | append_to menu_items, '[Graders]', 'graders', 'list' |
|
|
19 | 19 | append_to menu_items, '[Site config]', 'configurations', 'index' |
|
|
20 | 20 | menu_items << "<br/>" |
|
|
21 | 21 | end |
|
|
22 | 22 | |
|
|
23 | 23 | # main page |
|
|
24 | 24 | append_to menu_items, '[Main]', 'main', 'list' |
|
|
25 | 25 | append_to menu_items, '[Messages]', 'messages', 'list' |
|
|
26 | 26 | |
|
|
27 | 27 | if (user!=nil) and (Configuration.show_tasks_to?(user)) |
|
|
28 | 28 | append_to menu_items, '[Tasks]', 'tasks', 'list' |
|
|
29 | 29 | append_to menu_items, '[Submissions]', 'main', 'submission' |
|
|
30 | 30 | append_to menu_items, '[Test]', 'test', 'index' |
|
|
31 | 31 | end |
|
|
32 | 32 | append_to menu_items, '[Help]', 'main', 'help' |
|
|
33 | + | |
|
|
34 | + if Configuration['system.user_setting_enabled'] | |
|
|
33 | 35 | append_to menu_items, '[Settings]', 'users', 'index' |
|
|
36 | + end | |
|
|
34 | 37 | append_to menu_items, '[Log out]', 'main', 'login' |
|
|
35 | 38 | |
|
|
36 | 39 | menu_items |
|
|
37 | 40 | end |
|
|
38 | 41 | |
|
|
39 | 42 | def append_to(option,label, controller, action) |
|
|
40 | 43 | option << ' ' if option!='' |
|
|
41 | 44 | option << link_to_unless_current(label, |
|
|
42 | 45 | :controller => controller, |
|
|
43 | 46 | :action => action) |
|
|
44 | 47 | end |
|
|
45 | 48 | |
|
|
46 | 49 | def format_short_time(time) |
|
|
47 | 50 | now = Time.now.gmtime |
|
|
48 | 51 | st = '' |
|
|
49 | 52 | if (time.yday != now.yday) or |
|
|
50 | 53 | (time.year != now.year) |
|
|
51 | 54 | st = time.strftime("%x ") |
|
|
52 | 55 | end |
|
|
53 | 56 | st + time.strftime("%X") |
|
|
54 | 57 | end |
|
|
55 | 58 | |
|
|
56 | 59 | def read_textfile(fname,max_size=2048) |
|
|
57 | 60 | begin |
| @@ -1,23 +1,31 | |||
|
|
1 | 1 | class AddMoreOptionsToConfigurations < ActiveRecord::Migration |
|
|
2 | 2 | def self.up |
|
|
3 | 3 | # If the server is in contest mode and |
|
|
4 | 4 | # Configuration['contest.multisites'] is true |
|
|
5 | 5 | # the menu for site administrator is shown. |
|
|
6 | 6 | |
|
|
7 | 7 | Configuration.create(:key => 'contest.multisites', |
|
|
8 | 8 | :value_type => 'boolean', |
|
|
9 | 9 | :value => 'false') |
|
|
10 | 10 | |
|
|
11 | 11 | # If Configuration['system.online_registration'] is true, |
|
|
12 | 12 | # the registration menu would appear |
|
|
13 | 13 | |
|
|
14 | 14 | Configuration.create(:key => 'system.online_registration', |
|
|
15 | 15 | :value_type => 'boolean', |
|
|
16 | 16 | :value => 'false') |
|
|
17 | + | |
|
|
18 | + # If Configuration['system.user_setting_enabled'] is true, | |
|
|
19 | + # users can change their settings | |
|
|
20 | + | |
|
|
21 | + Configuration.create(:key => 'system.user_setting_enabled', | |
|
|
22 | + :value_type => 'boolean', | |
|
|
23 | + :value => 'true') | |
|
|
17 | 24 | end |
|
|
18 | 25 | |
|
|
19 | 26 | def self.down |
|
|
20 | 27 | Configuration.find_by_key('contest.multisites').destroy |
|
|
21 | 28 | Configuration.find_by_key('system.online_registration').destroy |
|
|
29 | + Configuration.find_by_key('system.user_setting_enabled').destroy | |
|
|
22 | 30 | end |
|
|
23 | 31 | end |
You need to be logged in to leave comments.
Login now