cafe-grader-web Commit - r104:7a05c208f2ec

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:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r104:7a05c208f2ec - Sat, 26 Apr 2008 09:00:25 - 6 files changed: 23 inserted, 10 deleted

app/controllers/announcements_controller.rb ¶ +1 -2

               class AnnouncementsController < ApplicationController
-            -   before_filter :authenticate
+            +   before_filter :admin_authorization
-            -   before_filter { |controller| controller.authorization_by_roles(['admin'])}
                 in_place_edit_for :announcement, :published
                 # GET /announcements
                 # GET /announcements.xml
                 def index
                   @announcements = Announcement.find(:all,
                                                      :order => "created_at DESC")
                   respond_to do |format|
                     format.html # index.html.erb
                     format.xml  { render :xml => @announcements }
                   end
                 end
                 # GET /announcements/1
                 # GET /announcements/1.xml
                 def show
                   @announcement = Announcement.find(params[:id])
                   respond_to do |format|
                     format.html # show.html.erb
                     format.xml  { render :xml => @announcement }
                   end
                 end
                 # GET /announcements/new
                 # GET /announcements/new.xml
                 def new
                   @announcement = Announcement.new
                   respond_to do |format|
                     format.html # new.html.erb
                     format.xml  { render :xml => @announcement }
                   end
                 end
                 # GET /announcements/1/edit
                 def edit
                   @announcement = Announcement.find(params[:id])
                 end
                 # POST /announcements
                 # POST /announcements.xml
                 def create
                   @announcement = Announcement.new(params[:announcement])
                   respond_to do |format|
                     if @announcement.save
                       flash[:notice] = 'Announcement was successfully created.'
                       format.html { redirect_to(@announcement) }
                       format.xml  { render :xml => @announcement, :status => :created, :location => @announcement }
                     else
                       format.html { render :action => "new" }
                       format.xml  { render :xml => @announcement.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 # PUT /announcements/1
                 # PUT /announcements/1.xml
                 def update
                   @announcement = Announcement.find(params[:id])
                   respond_to do |format|
                     if @announcement.update_attributes(params[:announcement])
                       flash[:notice] = 'Announcement was successfully updated.'
                       format.html { redirect_to(@announcement) }
                       format.xml  { head :ok }
                     else
                       format.html { render :action => "edit" }
                       format.xml  { render :xml => @announcement.errors, :status => :unprocessable_entity }
                     end
                   end
                 end
                 # DELETE /announcements/1
                 # DELETE /announcements/1.xml
                 def destroy
                   @announcement = Announcement.find(params[:id])
                   @announcement.destroy
                   respond_to do |format|
                     format.html { redirect_to(announcements_url) }
                     format.xml  { head :ok }
                   end
                 end
               end

app/controllers/application.rb ¶ +8 -1

               # Filters added to this controller apply to all controllers in the application.
               # Likewise, all the methods added will be available for all controllers.
               class ApplicationController < ActionController::Base
                 # Pick a unique cookie name to distinguish our session data from others'
                 session :session_key => '_grader_session_id'
                 SINGLE_USER_MODE_CONF_KEY = 'system.single_user_mode'
+            +   def admin_authorization
+            +     return false unless authenticate
+            +     user = User.find(session[:user_id], :include => ['roles'])
+            +     redirect_to :controller => 'main', :action => 'login' unless user.admin?
+            +   end
+            +
                 def authorization_by_roles(allowed_roles)
                   return false unless authenticate
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role| allowed_roles.member?(role.name) }
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                 end
                 protected
+            +
                 def authenticate
                   unless session[:user_id]
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
-            -     Configuration.reload
+            +     #Configuration.reload
                   # check if run in single user mode
                   if (Configuration[SINGLE_USER_MODE_CONF_KEY])
                     user = User.find(session[:user_id])
                     if user==nil or user.login != 'root'
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                     end
                   end
                   return true
                 end
                 def authorization
                   return false unless authenticate
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role|
               	role.rights.detect{ |right|
               	  right.controller == self.class.controller_name and
                         (right.action == 'all' or right.action == action_name)
               	}
                     }
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     #request.env['HTTP_REFERER'] ? (redirect_to :back) : (redirect_to :controller => 'login')
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                 end
                 def verify_time_limit
                   return true if session[:user_id]==nil
                   user = User.find(session[:user_id], :include => :site)
                   return true if user==nil or user.site == nil
                   if user.site.finished?
                     flash[:notice] = 'Error: the contest on your site is over.'
                     redirect_to :back
                     return false
                   end
                   return true
                 end
               end

app/controllers/login_controller.rb ¶ +5

               class LoginController < ApplicationController
                 def index
                   # show login screen
                   reset_session
                   redirect_to :controller => 'main', :action => 'login'
                 end
                 def login
                   if user = User.authenticate(params[:login], params[:password])
                     session[:user_id] = user.id
                     redirect_to :controller => 'main', :action => 'list'
+            +       if user.admin?
+            +         session[:admin] = true
+            +       else
+            +         session[:admin] = false
+            +       end
                   else
                     flash[:notice] = 'Wrong password'
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
               end

app/controllers/messages_controller.rb ¶ +1 -3

               class MessagesController < ApplicationController
                 before_filter :authenticate
                 verify :method => :post, :only => ['create'],
                        :redirect_to => { :action => 'list' }
-            -   before_filter :only => ['console','show'] do |controller|
+            +   before_filter :admin_authorization, :only => ['console','show','reply']
-            -     controller.authorization_by_roles(['admin'])
-            -   end
                 def list
                   @user = User.find(session[:user_id])
                   @messages = Message.find_all_sent_by_user(@user)
                 end
                 def console
                   @user = User.find(session[:user_id])
                   @messages = Message.find_all_system_unreplied_messages
                 end
                 def show
                   @message = Message.find(params[:id])
                 end
                 def create
                   user = User.find(session[:user_id])
                   @message = Message.new(params[:message])
                   @message.sender = user
                   if !@message.save
                     render :action => 'list' and return
                   else
                     flash[:notice] = 'New message posted'
                     redirect_to :action => 'list'
                   end
                 end
                 def reply
                   user = User.find(session[:user_id])
                   @message = Message.new(params[:r_message])
                   @message.sender = user
                   if !@message.save
                     render :action => 'show' and return
                   else
                     flash[:notice] = 'Message replied'
                     rep_msg = @message.replying_message
                     rep_msg.replied = true
                     rep_msg.save
                     redirect_to :action => 'console'
                   end
                 end
                 protected
                 def build_replying_message_hierarchy(user)
                   @all_messages = {}
                   # manually build replies hierarchy (to improve efficiency)
                   [@messages, @replied_messages].each do |collection|
                     collection.each do |m|
                       @all_messages[m.id] = {:msg => m, :replies => []}
                     end
                   end
                   @all_messages.each do |m|
                     rep_id = m.replying_message_id
                     if @all_messages[rep_id]!=nil
                       @all_messages[rep_id][:replies] << m
                     end
                   end
                 end
               end

app/helpers/application_helper.rb ¶ +1 -1

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
-            -     if (user!=nil) and (user.admin?)
+            +     if (user!=nil) and (session[:admin])
                     # admin menu
                     menu_items << "<b>Administrative task:</b> "
                     append_to menu_items, '[Announcements]', 'announcements', 'index'
                     append_to menu_items, '[Msg console]', 'messages', 'console'
                     append_to menu_items, '[Problem admin]', 'problems', 'index'
                     append_to menu_items, '[User admin]', 'user_admin', 'index'
                     append_to menu_items, '[User stat]', 'user_admin', 'user_stat'
                     #append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Site config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   # main page
                   append_to menu_items, '[Main]', 'main', 'list'
                   append_to menu_items, '[Messages]', 'messages', 'list'
                   append_to menu_items, '[Tasks]', 'tasks', 'list'
                   append_to menu_items, '[Submissions]', 'main', 'submission'
                   append_to menu_items, '[Test]', 'test', 'index'
                   append_to menu_items, '[Settings]', 'users', 'index'
                   append_to menu_items, '[Log out]', 'main', 'login'
                   menu_items
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 def format_short_time(time)
                   now = Time.now
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                 def user_title_bar(user)
                   if user.site!=nil and user.site.finished?
                     contest_over_string = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                   end
                   <<TITLEBAR
               <div class="title">
               <table>
               #{contest_over_string}
               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
               Current time is #{format_short_time(Time.new)}<br/>
               </td>
               <td class="right-col">APIO'08</td>
               </tr>
               </table>
               </div>
               TITLEBAR
                 end
               end

app/views/configurations/index.html.haml ¶ +7 -3

               - content_for :head do
                 = javascript_include_tag :defaults
               %h1 Grader configuration
               %table.info
                 %tr.info-head
                   %th Key
                   %th Type
                   %th Value
                 - @configurations.each do |conf|
                   - @configuration = conf
                   %tr
                     %td
                       = in_place_editor_field :configuration, :key, {}, :rows=>1
                     %td
                       = in_place_editor_field :configuration, :value_type, {}, :rows=>1
                     %td
                       = in_place_editor_field :configuration, :value, {}, :rows=>1
               %br/
-            - = link_to '[Reload configuration]', :action => 'reload'
+            + Your config is saved, but it does not automatically take effect.
               %br/
-            - Your config is saved, but it does not automatically take effect.
+            + If you have one mongrel process running, you can
-            - You must reload.
+            + = link_to '[click]', :action => 'reload'
+            + here to reload.
+            + %br/
+            + If you have more than one process running, you should restart
+            + them manually.

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r104:7a05c208f2ec - Sat, 26 Apr 2008 09:00:25 - 6 files changed: 23 inserted, 10 deleted

Sign in to your account

Commit r104:7a05c208f2ec public

Author

r104:7a05c208f2ec - Sat, 26 Apr 2008 09:00:25 - 6 files changed: 23 inserted, 10 deleted

Commit `r104:7a05c208f2ec` public