cafe-grader-web Commit - r122:dfa0387efb1e

cafe-grader-web

Commit `r122:dfa0387efb1e` public

parent | child

Description:

[web] added mode + access control, when sites started/finished git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@250 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

r122:dfa0387efb1e - Wed, 07 May 2008 11:44:42 - 9 files changed: 188 inserted, 84 deleted

db/migrate/036_add_mode_to_configurations.rb created 644 ¶ +17

@@ -0,0 +1,17
	1	+ class AddModeToConfigurations < ActiveRecord::Migration
	2	+ def self.up
	3	+
	4	+ # Configuration['system.mode']:
	5	+ # * 'standard' mode
	6	+ # * 'contest' mode (check site start time/stop time)
	7	+ # * 'analysis' mode (show results, no new submissions)
	8	+
	9	+ Configuration.create(:key => 'system.mode',
	10	+ :value_type => 'string',
	11	+ :value => 'standard')
	12	+ end
	13	+
	14	+ def self.down
	15	+ Configuration.find_by_key('system.mode').destroy
	16	+ end
	17	+ end

app/controllers/main_controller.rb ¶ +13 -1

               class MainController < ApplicationController
+            +   SYSTEM_MODE_CONF_KEY = 'system.mode'
+            +
                 before_filter :authenticate, :except => [:index, :login]
+            +   before_filter :check_viewability
               #
               #  COMMENT OUT: filter in each action instead
                   end
                   @submission.submitted_at = Time.new.gmtime
-            -     if user.site!=nil and user.site.finished?
+            +     if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and
+            +         user.site!=nil and user.site.finished?
                     @submission.errors.add_to_base "The contest is over."
                     prepare_list_information
                     render :action => 'list' and return
                                                      :order => "created_at DESC")
                 end
+            +   def check_viewability
+            +     user = User.find(session[:user_id])
+            +     if (!Configuration.show_tasks_to?(user)) and
+            +         ((action_name=='submission') or (action_name=='submit'))
+            +       redirect_to :action => 'list' and return
+            +     end
+            +   end
+            +
               end

app/controllers/tasks_controller.rb ¶ +11 -2

               class TasksController < ApplicationController
-            -   before_filter :authenticate
+            +   before_filter :authenticate, :check_viewability
                 def index
                   redirect_to :action => 'list'
                   @user = User.find(session[:user_id])
                 end
+            +   protected
+            +
+            +   def check_viewability
+            +     user = User.find(session[:user_id])
+            +     if user==nil or !Configuration.show_tasks_to?(user)
+            +       redirect_to :controller => 'main', :action => 'list'
+            +       return false
+            +     end
+            +   end
+            +
               end

app/controllers/test_controller.rb ¶ +15 -2

               class TestController < ApplicationController
-            -   before_filter :authenticate
+            +   SYSTEM_MODE_CONF_KEY = 'system.mode'
+            +
+            +   before_filter :authenticate, :check_viewability
               #
               #  COMMENT OUT: filter in each action instead
                     render :action => 'index' and return
                   end
-            -     if @user.site!=nil and @user.site.finished?
+            +     if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and
+            +         @user.site!=nil and @user.site.finished?
                     @submitted_test_request.errors.add_to_base('Contest is over.')
                     prepare_index_information
                     render :action => 'index' and return
                   @test_requests = @user.test_requests
                 end
+            +   def check_viewability
+            +     user = User.find(session[:user_id])
+            +     if !Configuration.show_tasks_to?(user)
+            +       redirect_to :controller => 'main', :action => 'list'
+            +     end
+            +     if (!Configuration.show_submitbox_to?(user)) and (action_name=='submit')
+            +       redirect_to :controller => 'test', :action => 'index'
+            +     end
+            +   end
+            +
               end

app/helpers/application_helper.rb ¶ +36 -14

               # 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])
                   # 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'
+            +     if (user!=nil) and (Configuration.show_tasks_to?(user))
-            -     append_to menu_items, '[Test]', 'test', 'index'
+            +       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'
                   #append_to menu_items, '[Settings]', 'users', 'index'
                   append_to menu_items, '[Log out]', 'main', 'login'
                   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)
-            -     if user.site!=nil and user.site.finished?
+            +     header = ''
-            -       contest_over_string = <<CONTEST_OVER
+            +     #
+            +     # if the contest is over
+            +     if Configuration[SYSTEM_MODE_CONF_KEY]=='contest' and
+            +         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 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
+            +
+            +     #
+            +     # build real title bar
                   <<TITLEBAR
               <div class="title">
               <table>
-            - #{contest_over_string}
+            + #{header}
               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
               TITLEBAR
                 end
-            -   def read_textfile(fname,max_size=2048)
-            -     begin
-            -       File.open(fname).read(max_size)
-            -     rescue
-            -       nil
-            -     end
-            -   end
               end

app/models/configuration.rb ¶ +27

@@ -1,5 +1,10
		1	+ #
		2	+ # This class also contains various login of the system.
		3	+ #
1	class Configuration < ActiveRecord::Base	4	class Configuration < ActiveRecord::Base
2		5
		6	+ SYSTEM_MODE_CONF_KEY = 'system.mode'
		7	+
3	@@configurations = nil	8	@@configurations = nil
4		9
5	def self.get(key)	10	def self.get(key)
@@ -21,6 +26,28
21	@@configurations = nil	26	@@configurations = nil
22	end	27	end
23		28
		29	+ #
		30	+ # View decision
		31	+ #
		32	+ def self.show_submitbox_to?(user)
		33	+ mode = get(SYSTEM_MODE_CONF_KEY)
		34	+ return false if mode=='analysis'
		35	+ if (mode=='contest')
		36	+ return false if (user.site!=nil) and
		37	+ ((user.site.started==false) or (user.site.finished?))
		38	+ end
		39	+ return true
		40	+ end
		41	+
		42	+ def self.show_tasks_to?(user)
		43	+ mode = get(SYSTEM_MODE_CONF_KEY)
		44	+ if (mode=='contest')
		45	+ return false if (user.site!=nil) and (user.site.started==false)
		46	+ end
		47	+ return true
		48	+ end
		49	+
		50	+
24	protected	51	protected
25	def self.read_config	52	def self.read_config
26	@@configurations = {}	53	@@configurations = {}

app/views/main/list.html.haml ¶ +12 -10

                     Announcements
                   = render :partial => 'announcement', :collection => @announcements
-            - .submitbox
+            + - if Configuration.show_submitbox_to?(@user)
-            -   = error_messages_for 'submission'
+            +   .submitbox
-            -   = render :partial => 'submission_box'
+            +     = error_messages_for 'submission'
+            +     = render :partial => 'submission_box'
               %hr/
-            - %table.info
+            + - if Configuration.show_tasks_to?(@user)
-            -   %tr.info-head
+            +   %table.info
-            -     %th
+            +     %tr.info-head
-            -     %th Tasks
+            +       %th
-            -     %th # of sub(s)
+            +       %th Tasks
-            -     %th Results
+            +       %th # of sub(s)
-            -   = render :partial => 'problem', :collection => @problems
+            +       %th Results
+            +     = render :partial => 'problem', :collection => @problems
               %hr/

app/views/test/index.html.erb ¶ +56 -54

@@ -30,61 +30,63
30	}	30	}
31	</script>	31	</script>
32		32
33	- <div class="submitbox">	33	+ <% if Configuration.show_submitbox_to?(@user) %>
34	- <%= error_messages_for 'submitted_test_request' %>	34	+ <div class="submitbox">
35	- <% form_for :test_request, nil,	35	+ <%= error_messages_for 'submitted_test_request' %>
36	- :url => { :action => 'submit'},	36	+ <% form_for :test_request, nil,
37	- :html => { :multipart => true } do \|f\| %>	37	+ :url => { :action => 'submit'},
38	- <table>	38	+ :html => { :multipart => true } do \|f\| %>
39	- <tr>	39	+ <table>
40	- <t~~d>Task:</td~~>	40	+ <tr>
41	- <td>	41	+ <td>Task:</td>
42	- <%= select(:test_request,	42	+ <td>
43	- :problem_id,	43	+ <%= select(:test_request,
44	- @problems.collect {\|p\| [p.name, p.id]}, {},	44	+ :problem_id,
45	- { :onclick => "updateSubmissionList();" }) %>	45	+ @problems.collect {\|p\| [p.name, p.id]}, {},
46	- </td>	46	+ { :onclick => "updateSubmissionList();" }) %>
47	- </tr>	47	+ </td>
48	- <tr>	48	+ </tr>
49	- <td>Submission:</td>	49	+ <tr>
50	- <td>	50	+ <td>Submission:</td>
51	- <%= select(:test_request,	51	+ <td>
52	- :submission_number,	52	+ <%= select(:test_request,
53	- ((1..@submissions[0].number).collect {\|n\| [n,n]}).reverse) %>	53	+ :submission_number,
54	- </td>	54	+ ((1..@submissions[0].number).collect {\|n\| [n,n]}).reverse) %>
55	- </tr>	55	+ </td>
56	- <tr>	56	+ </tr>
57	- <td>Input data:</td>	57	+ <tr>
58	- <td>	58	+ <td>Input data:</td>
59	- <%= f.file_field :input_file %>	59	+ <td>
60	- </td>	60	+ <%= f.file_field :input_file %>
61	- <td>	61	+ </td>
62	- (combined size should not exceed 2MB)	62	+ <td>
63	- </td>	63	+ (combined size should not exceed 2MB)
64	- </tr>	64	+ </td>
65	- <tr>	65	+ </tr>
66	- <td>	66	+ <tr>
67	- Additional file<sup><span style="color:red">*</span></sup>:	67	+ <td>
68	- </td>	68	+ Additional file<sup><span style="color:red">*</span></sup>:
69	- <td>	69	+ </td>
70	- <%= f.file_field :additional_file %>	70	+ <td>
71	- </td>	71	+ <%= f.file_field :additional_file %>
72	- <td>	72	+ </td>
73	- <~~small~~>	73	+ <td>
74	- * This option works <u>only</u> for task max.	74	+ <small>
75	- You can use this to submit <tt>questions.txt</tt>.<br/>	75	+ * This option works <u>only</u> for task max.
76	- The file shall be copied to the execution directory before your program runs.	76	+ You can use this to submit <tt>questions.txt</tt>.<br/>
77	- </small>	77	+ The file shall be copied to the execution directory before your program runs.
78	- ~~</td>~~	78	+ </small>
79	- </tr>	79	+ </td>
80	- <tr>	80	+ </tr>
81	- <td colspan="2">	81	+ <tr>
82	- <%= submit_tag 'submit' %>	82	+ <td colspan="2">
83	- </td>	83	+ <%= submit_tag 'submit' %>
84	- </tr>	84	+ </td>
85	- </table>	85	+ </tr>
		86	+ </table>
		87	+ <% end %>
		88	+ </div>
86	<% end %>	89	<% end %>
87	- </div>
88		90
89	<h3>Previous requests</h3>	91	<h3>Previous requests</h3>
90		92

db/schema.rb ¶ +1 -1

               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 35) do
+            + ActiveRecord::Schema.define(:version => 36) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"

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

r122:dfa0387efb1e - Wed, 07 May 2008 11:44:42 - 9 files changed: 188 inserted, 84 deleted

Sign in to your account

Commit r122:dfa0387efb1e public

Author

r122:dfa0387efb1e - Wed, 07 May 2008 11:44:42 - 9 files changed: 188 inserted, 84 deleted

Commit `r122:dfa0387efb1e` public