Commit e4fb9ec6 by Victor Shnayder

Remove is_staff from ModuleSystem

- now handling access control via get_module
parent b782e2ff
...@@ -215,9 +215,6 @@ def preview_module_system(request, preview_id, descriptor): ...@@ -215,9 +215,6 @@ def preview_module_system(request, preview_id, descriptor):
render_template=render_from_lms, render_template=render_from_lms,
debug=True, debug=True,
replace_urls=replace_urls, replace_urls=replace_urls,
# TODO (vshnayder): All CMS users get staff view by default
# is that what we want?
is_staff=True,
) )
......
...@@ -35,7 +35,6 @@ i4xs = ModuleSystem( ...@@ -35,7 +35,6 @@ i4xs = ModuleSystem(
filestore=fs.osfs.OSFS(os.path.dirname(os.path.realpath(__file__))+"/test_files"), filestore=fs.osfs.OSFS(os.path.dirname(os.path.realpath(__file__))+"/test_files"),
debug=True, debug=True,
xqueue={'interface':None, 'callback_url':'/', 'default_queuename': 'testqueue'}, xqueue={'interface':None, 'callback_url':'/', 'default_queuename': 'testqueue'},
is_staff=False,
node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules") node_path=os.environ.get("NODE_PATH", "/usr/local/lib/node_modules")
) )
...@@ -336,7 +335,7 @@ class CodeResponseTest(unittest.TestCase): ...@@ -336,7 +335,7 @@ class CodeResponseTest(unittest.TestCase):
self.assertFalse(test_lcp.correct_map.is_queued(answer_ids[j])) # Should be dequeued, message delivered self.assertFalse(test_lcp.correct_map.is_queued(answer_ids[j])) # Should be dequeued, message delivered
else: else:
self.assertTrue(test_lcp.correct_map.is_queued(answer_ids[j])) # Should be queued, message undelivered self.assertTrue(test_lcp.correct_map.is_queued(answer_ids[j])) # Should be queued, message undelivered
def test_convert_files_to_filenames(self): def test_convert_files_to_filenames(self):
problem_file = os.path.dirname(__file__) + "/test_files/coderesponse.xml" problem_file = os.path.dirname(__file__) + "/test_files/coderesponse.xml"
fp = open(problem_file) fp = open(problem_file)
...@@ -347,7 +346,7 @@ class CodeResponseTest(unittest.TestCase): ...@@ -347,7 +346,7 @@ class CodeResponseTest(unittest.TestCase):
self.assertEquals(answers_converted['1_2_1'], 'String-based answer') self.assertEquals(answers_converted['1_2_1'], 'String-based answer')
self.assertEquals(answers_converted['1_3_1'], ['answer1', 'answer2', 'answer3']) self.assertEquals(answers_converted['1_3_1'], ['answer1', 'answer2', 'answer3'])
self.assertEquals(answers_converted['1_4_1'], fp.name) self.assertEquals(answers_converted['1_4_1'], fp.name)
class ChoiceResponseTest(unittest.TestCase): class ChoiceResponseTest(unittest.TestCase):
......
...@@ -612,8 +612,9 @@ class XModuleDescriptor(Plugin, HTMLSnippet): ...@@ -612,8 +612,9 @@ class XModuleDescriptor(Plugin, HTMLSnippet):
def _try_parse_time(self, key): def _try_parse_time(self, key):
""" """
Parse an optional metadata key containing a time: if present, must be valid. Parse an optional metadata key containing a time: if present, complain
Return None if not present. if it doesn't parse.
Return None if not present or invalid.
""" """
if key in self.metadata: if key in self.metadata:
try: try:
...@@ -704,7 +705,6 @@ class ModuleSystem(object): ...@@ -704,7 +705,6 @@ class ModuleSystem(object):
filestore=None, filestore=None,
debug=False, debug=False,
xqueue=None, xqueue=None,
is_staff=False,
node_path=""): node_path=""):
''' '''
Create a closure around the system environment. Create a closure around the system environment.
...@@ -735,9 +735,6 @@ class ModuleSystem(object): ...@@ -735,9 +735,6 @@ class ModuleSystem(object):
replace_urls - TEMPORARY - A function like static_replace.replace_urls replace_urls - TEMPORARY - A function like static_replace.replace_urls
that capa_module can use to fix up the static urls in that capa_module can use to fix up the static urls in
ajax results. ajax results.
is_staff - Is the user making the request a staff user?
TODO (vshnayder): this will need to change once we have real user roles.
''' '''
self.ajax_url = ajax_url self.ajax_url = ajax_url
self.xqueue = xqueue self.xqueue = xqueue
...@@ -748,7 +745,6 @@ class ModuleSystem(object): ...@@ -748,7 +745,6 @@ class ModuleSystem(object):
self.DEBUG = self.debug = debug self.DEBUG = self.debug = debug
self.seed = user.id if user is not None else 0 self.seed = user.id if user is not None else 0
self.replace_urls = replace_urls self.replace_urls = replace_urls
self.is_staff = is_staff
self.node_path = node_path self.node_path = node_path
def get(self, attr): def get(self, attr):
......
...@@ -221,7 +221,6 @@ def get_module(user, request, location, student_module_cache, position=None): ...@@ -221,7 +221,6 @@ def get_module(user, request, location, student_module_cache, position=None):
# a module is coming through get_html and is therefore covered # a module is coming through get_html and is therefore covered
# by the replace_static_urls code below # by the replace_static_urls code below
replace_urls=replace_urls, replace_urls=replace_urls,
is_staff=has_access(user, location, 'staff'),
node_path=settings.NODE_PATH node_path=settings.NODE_PATH
) )
# pass position specified in URL to module through ModuleSystem # pass position specified in URL to module through ModuleSystem
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment