cafe-grader-web

Commit r104:7a05c208f2ec public

parent | child
Description:
[web] improved log-in & roles efficiency git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@196 6386c4cd-e34a-4fa8-8920-d93eb39b512e
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore 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

r104:7a05c208f2ec - - 6 files changed: 23 inserted, 10 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,52 +1,51
1 1 class AnnouncementsController < ApplicationController
2 2
3 - before_filter :authenticate
4 - before_filter { |controller| controller.authorization_by_roles(['admin'])}
3 + before_filter :admin_authorization
5 4
6 5 in_place_edit_for :announcement, :published
7 6
8 7 # GET /announcements
9 8 # GET /announcements.xml
10 9 def index
11 10 @announcements = Announcement.find(:all,
12 11 :order => "created_at DESC")
13 12
14 13 respond_to do |format|
15 14 format.html # index.html.erb
16 15 format.xml { render :xml => @announcements }
17 16 end
18 17 end
19 18
20 19 # GET /announcements/1
21 20 # GET /announcements/1.xml
22 21 def show
23 22 @announcement = Announcement.find(params[:id])
24 23
25 24 respond_to do |format|
26 25 format.html # show.html.erb
27 26 format.xml { render :xml => @announcement }
28 27 end
29 28 end
30 29
31 30 # GET /announcements/new
32 31 # GET /announcements/new.xml
33 32 def new
34 33 @announcement = Announcement.new
35 34
36 35 respond_to do |format|
37 36 format.html # new.html.erb
38 37 format.xml { render :xml => @announcement }
39 38 end
40 39 end
41 40
42 41 # GET /announcements/1/edit
43 42 def edit
44 43 @announcement = Announcement.find(params[:id])
45 44 end
46 45
47 46 # POST /announcements
48 47 # POST /announcements.xml
49 48 def create
50 49 @announcement = Announcement.new(params[:announcement])
51 50
52 51 respond_to do |format|
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,69 +1,76
1 1 # Filters added to this controller apply to all controllers in the application.
2 2 # Likewise, all the methods added will be available for all controllers.
3 3
4 4 class ApplicationController < ActionController::Base
5 5 # Pick a unique cookie name to distinguish our session data from others'
6 6 session :session_key => '_grader_session_id'
7 7
8 8 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
9 9
10 + def admin_authorization
11 + return false unless authenticate
12 + user = User.find(session[:user_id], :include => ['roles'])
13 + redirect_to :controller => 'main', :action => 'login' unless user.admin?
14 + end
15 +
10 16 def authorization_by_roles(allowed_roles)
11 17 return false unless authenticate
12 18 user = User.find(session[:user_id])
13 19 unless user.roles.detect { |role| allowed_roles.member?(role.name) }
14 20 flash[:notice] = 'You are not authorized to view the page you requested'
15 21 redirect_to :controller => 'main', :action => 'login'
16 22 return false
17 23 end
18 24 end
19 25
20 26 protected
27 +
21 28 def authenticate
22 29 unless session[:user_id]
23 30 redirect_to :controller => 'main', :action => 'login'
24 31 return false
25 32 end
26 33
27 - Configuration.reload
34 + #Configuration.reload
28 35 # check if run in single user mode
29 36 if (Configuration[SINGLE_USER_MODE_CONF_KEY])
30 37 user = User.find(session[:user_id])
31 38 if user==nil or user.login != 'root'
32 39 redirect_to :controller => 'main', :action => 'login'
33 40 return false
34 41 end
35 42 end
36 43
37 44 return true
38 45 end
39 46
40 47 def authorization
41 48 return false unless authenticate
42 49 user = User.find(session[:user_id])
43 50 unless user.roles.detect { |role|
44 51 role.rights.detect{ |right|
45 52 right.controller == self.class.controller_name and
46 53 (right.action == 'all' or right.action == action_name)
47 54 }
48 55 }
49 56 flash[:notice] = 'You are not authorized to view the page you requested'
50 57 #request.env['HTTP_REFERER'] ? (redirect_to :back) : (redirect_to :controller => 'login')
51 58 redirect_to :controller => 'main', :action => 'login'
52 59 return false
53 60 end
54 61 end
55 62
56 63 def verify_time_limit
57 64 return true if session[:user_id]==nil
58 65 user = User.find(session[:user_id], :include => :site)
59 66 return true if user==nil or user.site == nil
60 67 if user.site.finished?
61 68 flash[:notice] = 'Error: the contest on your site is over.'
62 69 redirect_to :back
63 70 return false
64 71 end
65 72 return true
66 73 end
67 74
68 75 end
69 76
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,19 +1,24
1 1 class LoginController < ApplicationController
2 2
3 3 def index
4 4 # show login screen
5 5 reset_session
6 6 redirect_to :controller => 'main', :action => 'login'
7 7 end
8 8
9 9 def login
10 10 if user = User.authenticate(params[:login], params[:password])
11 11 session[:user_id] = user.id
12 12 redirect_to :controller => 'main', :action => 'list'
13 + if user.admin?
14 + session[:admin] = true
15 + else
16 + session[:admin] = false
17 + end
13 18 else
14 19 flash[:notice] = 'Wrong password'
15 20 redirect_to :controller => 'main', :action => 'login'
16 21 end
17 22 end
18 23
19 24 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,58 +1,56
1 1 class MessagesController < ApplicationController
2 2
3 3 before_filter :authenticate
4 4
5 5 verify :method => :post, :only => ['create'],
6 6 :redirect_to => { :action => 'list' }
7 7
8 - before_filter :only => ['console','show'] do |controller|
9 - controller.authorization_by_roles(['admin'])
10 - end
8 + before_filter :admin_authorization, :only => ['console','show','reply']
11 9
12 10 def list
13 11 @user = User.find(session[:user_id])
14 12 @messages = Message.find_all_sent_by_user(@user)
15 13 end
16 14
17 15 def console
18 16 @user = User.find(session[:user_id])
19 17 @messages = Message.find_all_system_unreplied_messages
20 18 end
21 19
22 20 def show
23 21 @message = Message.find(params[:id])
24 22 end
25 23
26 24 def create
27 25 user = User.find(session[:user_id])
28 26 @message = Message.new(params[:message])
29 27 @message.sender = user
30 28 if !@message.save
31 29 render :action => 'list' and return
32 30 else
33 31 flash[:notice] = 'New message posted'
34 32 redirect_to :action => 'list'
35 33 end
36 34 end
37 35
38 36 def reply
39 37 user = User.find(session[:user_id])
40 38 @message = Message.new(params[:r_message])
41 39 @message.sender = user
42 40 if !@message.save
43 41 render :action => 'show' and return
44 42 else
45 43 flash[:notice] = 'Message replied'
46 44 rep_msg = @message.replying_message
47 45 rep_msg.replied = true
48 46 rep_msg.save
49 47 redirect_to :action => 'console'
50 48 end
51 49 end
52 50
53 51 protected
54 52 def build_replying_message_hierarchy(user)
55 53 @all_messages = {}
56 54
57 55
58 56 # manually build replies hierarchy (to improve efficiency)
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,56 +1,56
1 1 # Methods added to this helper will be available to all templates in the application.
2 2 module ApplicationHelper
3 3
4 4 def user_header
5 5 menu_items = ''
6 6 user = User.find(session[:user_id])
7 7
8 - if (user!=nil) and (user.admin?)
8 + if (user!=nil) and (session[:admin])
9 9 # admin menu
10 10 menu_items << "<b>Administrative task:</b> "
11 11 append_to menu_items, '[Announcements]', 'announcements', 'index'
12 12 append_to menu_items, '[Msg console]', 'messages', 'console'
13 13 append_to menu_items, '[Problem admin]', 'problems', 'index'
14 14 append_to menu_items, '[User admin]', 'user_admin', 'index'
15 15 append_to menu_items, '[User stat]', 'user_admin', 'user_stat'
16 16 #append_to menu_items, '[Graders]', 'graders', 'list'
17 17 append_to menu_items, '[Site config]', 'configurations', 'index'
18 18 menu_items << "<br/>"
19 19 end
20 20
21 21 # main page
22 22 append_to menu_items, '[Main]', 'main', 'list'
23 23 append_to menu_items, '[Messages]', 'messages', 'list'
24 24 append_to menu_items, '[Tasks]', 'tasks', 'list'
25 25 append_to menu_items, '[Submissions]', 'main', 'submission'
26 26 append_to menu_items, '[Test]', 'test', 'index'
27 27 append_to menu_items, '[Settings]', 'users', 'index'
28 28 append_to menu_items, '[Log out]', 'main', 'login'
29 29
30 30 menu_items
31 31 end
32 32
33 33 def append_to(option,label, controller, action)
34 34 option << ' ' if option!=''
35 35 option << link_to_unless_current(label,
36 36 :controller => controller,
37 37 :action => action)
38 38 end
39 39
40 40 def format_short_time(time)
41 41 now = Time.now
42 42 st = ''
43 43 if (time.yday != now.yday) or
44 44 (time.year != now.year)
45 45 st = time.strftime("%x ")
46 46 end
47 47 st + time.strftime("%X")
48 48 end
49 49
50 50
51 51 def user_title_bar(user)
52 52 if user.site!=nil and user.site.finished?
53 53 contest_over_string = <<CONTEST_OVER
54 54 <tr><td colspan="2" align="center">
55 55 <span class="contest-over-msg">THE CONTEST IS OVER</span>
56 56 </td></tr>
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,26 +1,30
1 1 - content_for :head do
2 2 = javascript_include_tag :defaults
3 3
4 4 %h1 Grader configuration
5 5
6 6 %table.info
7 7 %tr.info-head
8 8 %th Key
9 9 %th Type
10 10 %th Value
11 11
12 12 - @configurations.each do |conf|
13 13 - @configuration = conf
14 14 %tr
15 15 %td
16 16 = in_place_editor_field :configuration, :key, {}, :rows=>1
17 17 %td
18 18 = in_place_editor_field :configuration, :value_type, {}, :rows=>1
19 19 %td
20 20 = in_place_editor_field :configuration, :value, {}, :rows=>1
21 21
22 22 %br/
23 - = link_to '[Reload configuration]', :action => 'reload'
23 + Your config is saved, but it does not automatically take effect.
24 24 %br/
25 - Your config is saved, but it does not automatically take effect.
26 - You must reload.
25 + If you have one mongrel process running, you can
26 + = link_to '[click]', :action => 'reload'
27 + here to reload.
28 + %br/
29 + If you have more than one process running, you should restart
30 + them manually.
You need to be logged in to leave comments. Login now