Skip to content

Fix channel thumbnail links in Details.vue#2963

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

Merged
jonboiser merged 4 commits into from
Feb 17, 2021
Merged

Fix channel thumbnail links in Details.vue #2963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2fd4cff
Fix channel link in Details.vue
jonboiser Feb 17, 2021
6886592
Use `window.Urls.channel` instead of hard-coded link
jonboiser Feb 17, 2021
9530450
Reference window.Urls from within a method, not template
jonboiser Feb 17, 2021
226db27
Add pyenv “.python-version” to gitignore
jonboiser Feb 17, 2021
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,3 +120,6 @@ storybook-static/

# i18n
/contentcuration/locale/CSV_FILES/*

# pyenv
.python-version
7 changes: 5 additions & 2 deletions contentcuration/contentcuration/frontend/administration/pages/Users/UserDetails.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,7 +101,7 @@
<div v-for="channel in details.edit_channels" :key="channel.id" class="mb-2">
<ActionLink
:text="channel.name"
:href="`/channels/${channel.id}`"
:href="channelUrl(channel)"
target="_blank"
/>
</div>
Expand All@@ -115,7 +115,7 @@
<div v-for="channel in details.viewonly_channels" :key="channel.id" class="mb-2">
<ActionLink
:text="channel.name"
:href="`/channels/${channel.id}`"
:href="channelUrl(channel)"
target="_blank"
/>
</div>
Expand DownExpand Up@@ -282,6 +282,9 @@
},
methods: {
...mapActions('userAdmin', ['loadUser', 'loadUserDetails']),
channelUrl(channel) {
return window.Urls.channel(channel.id);
},
updateTitleForPage() {
this.updateTabTitle(`${this.userFullName} - Users - Administration`);
},
Expand Down
7 changes: 6 additions & 1 deletion contentcuration/contentcuration/frontend/shared/views/details/Details.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -231,7 +231,7 @@
</VFlex>
<a
v-else
:href="`/channels/${channel.id}/view`"
:href="channelUrl(channel)"
target="_blank"
class="notranslate primary--text"
>
Expand DownExpand Up@@ -382,6 +382,11 @@
return this.sortedTags.map(tag => tag.tag_name).join(', ');
},
},
methods: {
channelUrl(channel) {
return window.Urls.channel(channel.id);
},
},
$trs: {
/* eslint-disable kolibri/vue-no-unused-translations */
sizeHeading: 'Channel size',
Expand Down