cafe-grader-web Commit - r156:e751e4e9d100

cafe-grader-web

Commit `r156:e751e4e9d100` public

parent | child

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:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r156:e751e4e9d100 - Fri, 05 Dec 2008 09:07:20 - 3 files changed: 16 inserted, 4 deleted

app/controllers/users_controller.rb ¶ +5 -4

               class UsersController < ApplicationController
-            -   before_filter :authenticate
+            +   before_filter :authenticate, :except => [:new, :register]
                 verify :method => :post, :only => [:chg_passwd],
                        :redirect_to => { :action => :index }
                 in_place_edit_for :user, :alias_for_editing
                 in_place_edit_for :user, :email_for_editing
                 def index
-            -     # uncomment below to disable settings
+            +     if !Configuration['system.user_setting_enabled']
-            -     #redirect_to :controller => 'main', :action => 'list'
+            +       redirect_to :controller => 'main', :action => 'list'
+            +     else
                     @user = User.find(session[:user_id])
                   end
+            +   end
                 def chg_passwd
                   user = User.find(session[:user_id])
                   user.password = params[:passwd]
                   user.password_confirmation = params[:passwd_verify]
                   if user.save
                     flash[:notice] = 'password changed'
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
                   redirect_to :action => 'index'
                 end
               end

app/helpers/application_helper.rb ¶ +3

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
                 SYSTEM_MODE_CONF_KEY = 'system.mode'
                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
                   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'
                   if (user!=nil) and (Configuration.show_tasks_to?(user))
                     append_to menu_items, '[Tasks]', 'tasks', 'list'
                     append_to menu_items, '[Submissions]', 'main', 'submission'
                     append_to menu_items, '[Test]', 'test', 'index'
                   end
                   append_to menu_items, '[Help]', 'main', 'help'
+            +
+            +     if Configuration['system.user_setting_enabled']
                     append_to menu_items, '[Settings]', 'users', 'index'
+            +     end
                   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.gmtime
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
                 def user_title_bar(user)
                   header = ''
                   time_left = ''
                   #
                   # if the contest is over
                   if Configuration[SYSTEM_MODE_CONF_KEY]=='contest'
                     if user.site!=nil and user.site.finished?
                       header = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                     end
                     if user.site!=nil
                       time_left = ". Time left: #{Time.at(user.site.time_left).gmtime.strftime("%X")}"
                     end
                   end
                   #
                   # if the contest is in the anaysis mode
                   if Configuration[SYSTEM_MODE_CONF_KEY]=='analysis'
                     header = <<ANALYSISMODE
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">ANALYSIS MODE</span>
               </td></tr>
               ANALYSISMODE
                   end
                   contest_name = Configuration['contest.name']
                   #
                   # build real title bar
                   <<TITLEBAR
               <div class="title">
               <table>
               #{header}
               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
               Current time is #{format_short_time(Time.new.gmtime)} UTC
               #{time_left}
               <br/>
               </td>
               <td class="right-col">#{contest_name}</td>
               </tr>
               </table>
               </div>
               TITLEBAR
                 end
               end

db/migrate/20081204081043_add_more_options_to_configurations.rb ¶ +8

               class AddMoreOptionsToConfigurations < ActiveRecord::Migration
                 def self.up
                   # If the server is in contest mode and
                   #   Configuration['contest.multisites'] is true
                   #   the menu for site administrator is shown.
                   Configuration.create(:key => 'contest.multisites',
                                        :value_type => 'boolean',
                                        :value => 'false')
                   # If Configuration['system.online_registration'] is true,
                   #   the registration menu would appear
                   Configuration.create(:key => 'system.online_registration',
                                        :value_type => 'boolean',
                                        :value => 'false')
+            +
+            +     # If Configuration['system.user_setting_enabled'] is true,
+            +     #   users can change their settings
+            +
+            +     Configuration.create(:key => 'system.user_setting_enabled',
+            +                          :value_type => 'boolean',
+            +                          :value => 'true')
                 end
                 def self.down
                   Configuration.find_by_key('contest.multisites').destroy
                   Configuration.find_by_key('system.online_registration').destroy
+            +     Configuration.find_by_key('system.user_setting_enabled').destroy
                 end
               end

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

r156:e751e4e9d100 - Fri, 05 Dec 2008 09:07:20 - 3 files changed: 16 inserted, 4 deleted

Sign in to your account

Commit r156:e751e4e9d100 public

Author

r156:e751e4e9d100 - Fri, 05 Dec 2008 09:07:20 - 3 files changed: 16 inserted, 4 deleted

Commit `r156:e751e4e9d100` public