[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor display application handling #15076

Draft
wants to merge 10 commits into
base: dev
Choose a base branch
from
Draft

Refactor display application handling #15076

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0be2291
Remove unused parameter
guerler Nov 14, 2022
0ca512e
Add api endpoint for display applications
guerler Nov 15, 2022
77019e2
Redirect display application handling to client
guerler Nov 15, 2022
95f50bf
Add client route for display applications
guerler Nov 15, 2022
984e213
Build client url from attributes
guerler Nov 15, 2022
ab78425
Use composition api for display applications list
guerler Nov 15, 2022
fcaf44e
Connect display application component with api endpoint
guerler Nov 15, 2022
3f59645
Move create link from controller to display applications manager?
guerler Nov 19, 2022
6ec908a
Remove display application mako
guerler Nov 19, 2022
d44a848
Push route instead of reloading page
guerler Nov 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Push route instead of reloading page
  • Loading branch information
@guerler
guerler committed Nov 19, 2022
commit d44a848f5bf8ec890b244f02804d856e98429bf0
4 changes: 2 additions & 2 deletions client/src/components/Visualizations/DisplayApplications.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function getUrl(link) {
<span class="font-weight-bold">{{ displayApp.label }}</span>
<span v-for="(link, linkKey) in displayApp.links" :key="linkKey">
<span v-if="linkKey == 0">(</span>
<b-link :href="getUrl(link)" :target="link.target">{{ link.text }}</b-link>
<router-link :to="getUrl(link)">{{ link.text }}</router-link>
<span v-if="linkKey != displayApp.links.length - 1">, </span>
<span v-else>)</span>
</span>
Expand All @@ -38,7 +38,7 @@ function getUrl(link) {
<span class="font-weight-bold">{{ displayType.label }}</span>
<span v-for="(link, linkKey) in displayType.links" :key="linkKey">
<span v-if="linkKey == 0">(</span>
<b-link :href="link.href" :target="link.target">{{ link.text }}</b-link>
<router-link :to="link.href">{{ link.text }}</router-link>
<span v-if="linkKey != displayType.links.length - 1">, </span>
<span v-else>)</span>
</span>
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/managers/display_applications.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ def create_link(
refresh = True
else:
# We have permissions, dataset is not deleted and is in OK state, allow access
if not display_link.display_ready():
if display_link.display_ready():
# redirect user to url generated by display link
return dict(resource=display_link.display_url())
else:
Expand Down