Skip to content

Commit

Permalink
Merge pull request #16861 from mvdbeek/label_only_markdown_report
Browse files Browse the repository at this point in the history
[23.1] Allow referring to steps by label only in markdown editor
  • Loading branch information
mvdbeek authored Oct 17, 2023
2 parents bf1df29 + 5fb9ac4 commit 634d04f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions client/src/components/Markdown/MarkdownToolBox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -258,8 +258,8 @@ export default {
const steps = [];
this.steps &&
Object.values(this.steps).forEach((step) => {
if (step.label || step.content_id) {
steps.push(step.label || step.content_id);
if (step.label) {
steps.push(step.label);
}
});
return steps;
Expand Down
3 changes: 2 additions & 1 deletion lib/galaxy/managers/markdown_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,8 @@ def find_non_empty_group(match):
target_match = step_match
name = find_non_empty_group(target_match)
ref_object_type = "job"
ref_object = invocation.step_invocation_for_label(name).job
invocation_step = invocation.step_invocation_for_label(name)
ref_object = invocation_step and invocation_step.job
else:
target_match = None
ref_object = None
Expand Down

0 comments on commit 634d04f

Please sign in to comment.