Commit 8ce623ec by swdanielli

removing unused functions and code cleaning

parent 76252ae6
...@@ -33,6 +33,7 @@ from xblock.reference.plugins import Filesystem ...@@ -33,6 +33,7 @@ from xblock.reference.plugins import Filesystem
from webob.response import Response from webob.response import Response
def stem_url(url): def stem_url(url):
""" """
Get the base form of url. Get the base form of url.
...@@ -40,6 +41,7 @@ def stem_url(url): ...@@ -40,6 +41,7 @@ def stem_url(url):
""" """
return url.split('#')[0].split('%23')[0] return url.split('#')[0].split('%23')[0]
def data_structure_upgrade(old_list): def data_structure_upgrade(old_list):
""" """
Upgrade the data structure. Upgrade the data structure.
...@@ -55,6 +57,7 @@ def data_structure_upgrade(old_list): ...@@ -55,6 +57,7 @@ def data_structure_upgrade(old_list):
else: else:
return old_list return old_list
@XBlock.needs('fs') @XBlock.needs('fs')
class RecommenderXBlock(XBlock): class RecommenderXBlock(XBlock):
""" """
...@@ -257,7 +260,7 @@ class RecommenderXBlock(XBlock): ...@@ -257,7 +260,7 @@ class RecommenderXBlock(XBlock):
for parameter in self.client_side_settings: for parameter in self.client_side_settings:
result[parameter] = self.client_side_settings[parameter] result[parameter] = self.client_side_settings[parameter]
result['IS_USER_STAFF'] = self.get_user_is_staff() result['IS_USER_STAFF'] = self.get_user_is_staff()
result['INTRO'] = not self.seen and self.intro_enabled; result['INTRO'] = not self.seen and self.intro_enabled
tracker.emit('get_client_side_settings', result) tracker.emit('get_client_side_settings', result)
return result return result
...@@ -602,19 +605,6 @@ class RecommenderXBlock(XBlock): ...@@ -602,19 +605,6 @@ class RecommenderXBlock(XBlock):
return result return result
@XBlock.json_handler @XBlock.json_handler
def is_user_staff(self, _data, _suffix=''):
"""
Return whether the user is staff.
TODO: merged with get_client_side_settings and not supported in future update
Returns:
is_user_staff: whether the user is staff
"""
result = {'is_user_staff': self.get_user_is_staff()}
tracker.emit('is_user_staff', result)
return result
@XBlock.json_handler
def endorse_resource(self, data, _suffix=''): def endorse_resource(self, data, _suffix=''):
""" """
Endorse an entry of resource. Endorse an entry of resource.
...@@ -672,7 +662,6 @@ class RecommenderXBlock(XBlock): ...@@ -672,7 +662,6 @@ class RecommenderXBlock(XBlock):
result['recommendation']: (Dict) the deendorsed resource result['recommendation']: (Dict) the deendorsed resource
result['recommendation']['reason']: the reason why the resouce was deendorsed result['recommendation']['reason']: the reason why the resouce was deendorsed
""" """
# TODO: this function was named delete_resource previously, which should be changed in test_recommender
if not self.get_user_is_staff(): if not self.get_user_is_staff():
msg = 'Deendorse resource without permission' msg = 'Deendorse resource without permission'
return self.error_handler(msg, 'deendorse_resource') return self.error_handler(msg, 'deendorse_resource')
...@@ -704,10 +693,10 @@ class RecommenderXBlock(XBlock): ...@@ -704,10 +693,10 @@ class RecommenderXBlock(XBlock):
""" """
result = {} result = {}
result['export'] = { result['export'] = {
'recommendations':self.recommendations, 'recommendations': self.recommendations,
'deendorsed_recommendations':self.deendorsed_recommendations, 'deendorsed_recommendations': self.deendorsed_recommendations,
'endorsed_recommendation_ids':self.endorsed_recommendation_ids, 'endorsed_recommendation_ids': self.endorsed_recommendation_ids,
'endorsed_recommendation_reasons':self.endorsed_recommendation_reasons, 'endorsed_recommendation_reasons': self.endorsed_recommendation_reasons,
} }
if self.get_user_is_staff(): if self.get_user_is_staff():
result['export']['flagged_accum_resources'] = self.flagged_accum_resources result['export']['flagged_accum_resources'] = self.flagged_accum_resources
......
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