cafe-grader-web

Commit r316:fdc96046b715 public

parent | child
Description:
fixed error in config index
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

r316:fdc96046b715 - - 2 files changed: 5 inserted, 5 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -9,24 +9,28
9 9 TEST_REQUEST_EARLY_TIMEOUT_KEY = 'contest.test_request.early_timeout'
10 10 MULTICONTESTS_KEY = 'system.multicontests'
11 11 CONTEST_TIME_LIMIT_KEY = 'contest.time_limit'
12 12
13 13 cattr_accessor :config_cache
14 14 cattr_accessor :task_grading_info_cache
15 15 cattr_accessor :contest_time_str
16 16 cattr_accessor :contest_time
17 17
18 18 Configuration.config_cache = nil
19 19 Configuration.task_grading_info_cache = nil
20 20
21 + def self.config_cached?
22 + (defined? CONFIGURATION_CACHE_ENABLED) and (CONFIGURATION_CACHE_ENABLED)
23 + end
24 +
21 25 def self.get(key)
22 26 if Configuration.config_cached?
23 27 if Configuration.config_cache == nil
24 28 self.read_config
25 29 end
26 30 return Configuration.config_cache[key]
27 31 else
28 32 return Configuration.read_one_key(key)
29 33 end
30 34 end
31 35
32 36 def self.[](key)
@@ -123,28 +127,24
123 127 m = tmatch[2].to_i
124 128
125 129 Configuration.contest_time = h.hour + m.minute
126 130 else
127 131 Configuration.contest_time = nil
128 132 end
129 133 end
130 134 return Configuration.contest_time
131 135 end
132 136
133 137 protected
134 138
135 - def self.config_cached?
136 - (defined? CONFIGURATION_CACHE_ENABLED) and (CONFIGURATION_CACHE_ENABLED)
137 - end
138 -
139 139 def self.convert_type(val,type)
140 140 case type
141 141 when 'string'
142 142 return val
143 143
144 144 when 'integer'
145 145 return val.to_i
146 146
147 147 when 'boolean'
148 148 return (val=='true')
149 149 end
150 150 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -11,22 +11,22
11 11 %th Description
12 12 - @configurations.each do |conf|
13 13 - @configuration = conf
14 14 %tr{:class => cycle("info-odd", "info-even")}
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 %td= conf.description
22 22
23 - - if Configuration.cache?
23 + - if Configuration.config_cached?
24 24 %br/
25 25 Your config is saved, but it does not automatically take effect.
26 26 %br/
27 27 If you have one mongrel process running, you can
28 28 = link_to '[click]', :action => 'reload'
29 29 here to reload.
30 30 %br/
31 31 If you have more than one process running, you should restart
32 32 them manually.
You need to be logged in to leave comments. Login now