opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-24 12:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Raise page error instead of assert

Browse Source
This commit is contained in:
guerler
2020-10-05 15:25:22 +02:00
parent 54290bc942
commit 68ec777746
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/managers/markdown_util.py
+14 -1
View File
@@ -84,6 +84,10 @@ class GalaxyInternalMarkdownDirectiveHandler(metaclass=abc.ABCMeta):
job_manager = JobManager(trans.app)
collection_manager = trans.app.dataset_collections_service
def _check_object(object_id, line):
if object_id is None:
raise MalformedContents("Missing object identifier [%s]." % line)
def _remap(container, line):
id_match = re.search(UNENCODED_ID_PATTERN, line)
object_id = None
@@ -93,30 +97,39 @@ class GalaxyInternalMarkdownDirectiveHandler(metaclass=abc.ABCMeta):
encoded_id = trans.security.encode_id(object_id)
line = line.replace(id_match.group(), "{}={}".format(id_match.group(1), encoded_id))
if container == "history_dataset_display":
_check_object(object_id, line)
hda = hda_manager.get_accessible(object_id, trans.user)
rval = self.handle_dataset_display(line, hda)
elif container == "history_dataset_link":
_check_object(object_id, line)
hda = hda_manager.get_accessible(object_id, trans.user)
rval = self.handle_dataset_display(line, hda)
elif container == "history_dataset_index":
_check_object(object_id, line)
hda = hda_manager.get_accessible(object_id, trans.user)
rval = self.handle_dataset_display(line, hda)
elif container == "history_dataset_embedded":
_check_object(object_id, line)
hda = hda_manager.get_accessible(object_id, trans.user)
rval = self.handle_dataset_embedded(line, hda)
elif container == "history_dataset_as_image":
_check_object(object_id, line)
hda = hda_manager.get_accessible(object_id, trans.user)
rval = self.handle_dataset_as_image(line, hda)
elif container == "history_dataset_peek":
_check_object(object_id, line)
hda = hda_manager.get_accessible(object_id, trans.user)
rval = self.handle_dataset_peek(line, hda)
elif container == "history_dataset_info":
_check_object(object_id, line)
hda = hda_manager.get_accessible(object_id, trans.user)
rval = self.handle_dataset_info(line, hda)
elif container == "history_dataset_type":
_check_object(object_id, line)
hda = hda_manager.get_accessible(object_id, trans.user)
rval = self.handle_dataset_type(line, hda)
elif container == "history_dataset_name":
_check_object(object_id, line)
hda = hda_manager.get_accessible(object_id, trans.user)
rval = self.handle_dataset_name(line, hda)
elif container == "workflow_display":
@@ -148,7 +161,7 @@ class GalaxyInternalMarkdownDirectiveHandler(metaclass=abc.ABCMeta):
elif container == "visualization":
rval = None
else:
raise MalformedContents("Unknown Galaxy Markdown directive encountered [%s]" % container)
raise MalformedContents("Unknown Galaxy Markdown directive encountered [%s]." % container)
if rval is not None:
return rval
else: