cafe-grader-web Commit - r424:217b94aa4f76

cafe-grader-web

Commit `r424:217b94aa4f76` public

parent | child

Description:

add options to allow hall of fame viewing by any user add menu item for normal user

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r424:217b94aa4f76 - Thu, 11 Sep 2014 15:44:57 - 6 files changed: 40 inserted, 27 deleted

app/controllers/application_controller.rb ¶ +4

                   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]
+            +       flash[:notice] = 'You need to login'
+            +       if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
+            +         flash[:notice] = 'You need to login but you cannot log in at this time'
+            +       end
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                   # check if run in single user mode
                   if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                     user = User.find(session[:user_id])
                     if user==nil or (not user.admin?)
                       flash[:notice] = 'You cannot log in at this time'
                       redirect_to :controller => 'main', :action => 'login'
                       return false
                     end

app/controllers/report_controller.rb ¶ +7 -11

               class ReportController < ApplicationController
                 before_filter :admin_authorization, only: [:login_stat,:submission_stat]
-            -   before_filter(only: :problem_hof) { |c|
+            +   before_filter { |c|
-            -     user = User.find(session[:user_id]) if session[:user_id]
+            +     return false unless authenticate
-            -     if user==nil
-            -       flash[:notice] = 'You have to login first'
+            +     if GraderConfiguration["system.hall_of_fame_available"]
-            -       redirect_to :controller => 'main', :action => 'login'
+            +       return true;
-            -       return false
                   end
+            +
-            -     unless GraderConfiguration["hall_of_fame_available"]
+            +     admin_authorization
-            -       flash[:notice] = 'You are not authorized to view the page you requested'
-            -       redirect_to :controller => 'main', :action => 'login' unless GraderConfiguration[ "hall_of_fame_available" ]
-            -     end
                 }
                 def login_stat
                   @logins = Array.new
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
                   rescue
                     @since_time = DateTime.new(1000,1,1)
                   end
                   begin

app/helpers/application_helper.rb ¶ +4

                     menu_items << "<br/>"
                   end
                   # main page
                   append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list'
                   append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list'
                   if (user!=nil) and (GraderConfiguration.show_tasks_to?(user))
                     append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list'
                     append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission'
                     append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index'
                   end
+            +
+            +     if GraderConfiguration['system.hall_of_fame_available']
+            +       append_to menu_items, "[#{I18n.t 'menu.hall_of_fame'}]", 'report', 'problem_hof'
+            +     end
                   append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help'
                   if GraderConfiguration['system.user_setting_enabled']
                     append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login'
                   menu_items.html_safe
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''

config/locales/en.yml ¶ +1

                 go_ahead_to: "Go ahead to"
                 go_back_to: "Go back to"
                 login_page: "login page"
                 home_page: "home page"
                 menu:
                   main: 'Main'
                   messages: 'Messages'
                   tasks: 'Tasks'
                   submissions: 'Submissions'
                   test: 'Test Interface'
+            +     hall_of_fame: 'Hall of Fame'
                   help: 'Help'
                   settings: 'Settings'
                   log_out: 'Log out'
                 title_bar:
                   current_time: "Current time is"
                   remaining_time: "Time left: "
                   contest_not_started: "The contest has not started."
                 login:
                   message: 'Please login to see the problem list'
                   login_submit: 'Login'

config/locales/th.yml ¶ +1

                 go_ahead_to: "ไปยัง"
                 go_back_to: "กลับไปยัง"
                 login_page: "หน้าเข้าใช้ระบบ"
                 home_page: "หน้าแรก"
                 menu:
                   main: 'หน้าหลัก'
                   messages: 'ข้อความ'
                   tasks: 'โจทย์'
                   submissions: 'โปรแกรมที่ส่ง'
                   test: 'ทดสอบโปรแกรม'
+            +     hall_of_fame: 'หอเกียรติยศ'
                   help: 'ความช่วยเหลือ'
                   settings: 'เปลี่ยนรหัสผ่าน'
                   log_out: 'ออกจากระบบ'
                 title_bar:
                   current_time: "เวลาปัจจุบันคือ"
                   remaining_time: "เหลือเวลาอีก"
                   contest_not_started: "ยังไม่เริ่มแข่งขัน"
                 login:
                   message: 'กรุณา login เพื่อเข้าสู่ระบบ'
                   login_submit: 'เข้าใช้ระบบ'

db/seeds.rb ¶ +23 -16

               CONFIGURATIONS =
                 [
                  {
                    :key => 'system.single_user_mode',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'Only admins can log in to the system when running under single user mode.'
                  },
+            +
                  {
                    :key => 'ui.front.title',
                    :value_type => 'string',
                    :default_value => 'Grader'
                  },
+            +
                  {
                    :key => 'ui.front.welcome_message',
                    :value_type => 'string',
                    :default_value => 'Welcome!'
                  },
+            +
                  {
                    :key => 'ui.show_score',
                    :value_type => 'boolean',
                    :default_value => 'true'
                  },
+            +
                  {
                    :key => 'contest.time_limit',
                    :value_type => 'string',
                    :default_value => 'unlimited',
                    :description => 'Time limit in format hh:mm, or "unlimited" for contests with no time limits.  This config is CACHED.  Restart the server before the change can take effect.'
                  },
+            +
                  {
                    :key => 'system.mode',
                    :value_type => 'string',
                    :default_value => 'standard',
                    :description => 'Current modes are "standard", "contest", "indv-contest", and "analysis".'
                  },
+            +
                  {
                    :key => 'contest.name',
                    :value_type => 'string',
                    :default_value => 'Grader',
                    :description => 'This name will be shown on the user header bar.'
                  },
+            +
                  {
                    :key => 'contest.multisites',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :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.'
                  },
+            +
                  {
-            -      :key => 'system.online_registration',
+            +      :key => 'system.hall_of_fame_available',
                    :value_type => 'boolean',
                    :default_value => 'false',
-            -      :description => 'This option enables online registration.'
+            +      :description => 'If true, any user can access hall of fame page.'
                  },
+            +
                  # If Configuration['system.online_registration'] is true, the
                  # system allows online registration, and will use these
                  # information for sending confirmation emails.
                  {
                    :key => 'system.online_registration.smtp',
                    :value_type => 'string',
                    :default_value => 'smtp.somehost.com'
                  },
+            +
                  {
                    :key => 'system.online_registration.from',
                    :value_type => 'string',
                    :default_value => 'your.email@address'
                  },
+            +
                  {
                    :key => 'system.admin_email',
                    :value_type => 'string',
                    :default_value => 'admin@admin.email'
                  },
+            +
                  {
                    :key => 'system.user_setting_enabled',
                    :value_type => 'boolean',
                    :default_value => 'true',
                    :description => 'If this option is true, users can change their settings'
                  },
+            +
+            +    {
+            +      :key => 'system.user_setting_enabled',
+            +      :value_type => 'boolean',
+            +      :default_value => 'true',
+            +      :description => 'If this option is true, users can change their settings'
+            +    }
+            +
                  # If Configuration['contest.test_request.early_timeout'] is true
                  # the user will not be able to use test request at 30 minutes
                  # before the contest ends.
                  {
                    :key => 'contest.test_request.early_timeout',
                    :value_type => 'boolean',
                    :default_value => 'false'
                  },
                  {
                    :key => 'system.multicontests',
                    :value_type => 'boolean',
                  {
                    :key => 'contest.confirm_indv_contest_start',
                    :value_type => 'boolean',
                    :default_value => 'false'
                  },
                  {
                    :key => 'contest.default_contest_name',
                    :value_type => 'string',
                    :default_value => 'none',
                    :description => "New user will be assigned to this contest automatically, if it exists.  Set to 'none' if there is no default contest."
                  }
+            +
                 ]
               def create_configuration_key(key,
                                            value_type,
                                            default_value,
                                            description='')
                 conf = (GraderConfiguration.find_by_key(key) ||
                         GraderConfiguration.new(:key => key,
                                           :value_type => value_type,
                                           :value => default_value))
                 conf.description = description

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

r424:217b94aa4f76 - Thu, 11 Sep 2014 15:44:57 - 6 files changed: 40 inserted, 27 deleted

Sign in to your account

Commit r424:217b94aa4f76 public

Author

r424:217b94aa4f76 - Thu, 11 Sep 2014 15:44:57 - 6 files changed: 40 inserted, 27 deleted

Commit `r424:217b94aa4f76` public