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
@@ -18,6 +18,10
18 Configuration.config_cache = nil
18 Configuration.config_cache = nil
19 Configuration.task_grading_info_cache = nil
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 def self.get(key)
25 def self.get(key)
22 if Configuration.config_cached?
26 if Configuration.config_cached?
23 if Configuration.config_cache == nil
27 if Configuration.config_cache == nil
@@ -132,10 +136,6
132
136
133 protected
137 protected
134
138
135 - def self.config_cached?
136 - (defined? CONFIGURATION_CACHE_ENABLED) and (CONFIGURATION_CACHE_ENABLED)
137 - end
138 -
139 def self.convert_type(val,type)
139 def self.convert_type(val,type)
140 case type
140 case type
141 when 'string'
141 when 'string'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -20,7 +20,7
20 = in_place_editor_field :configuration, :value, {}, :rows=>1
20 = in_place_editor_field :configuration, :value, {}, :rows=>1
21 %td= conf.description
21 %td= conf.description
22
22
23 - - if Configuration.cache?
23 + - if Configuration.config_cached?
24 %br/
24 %br/
25 Your config is saved, but it does not automatically take effect.
25 Your config is saved, but it does not automatically take effect.
26 %br/
26 %br/
You need to be logged in to leave comments. Login now