OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix videos overview tags section

pull/1000/merge
Chocobozzz 2018-08-31 17:32:35 +02:00
parent 9a629c6efb
commit 4b54f1360e
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/app/menu/menu.component.scss
View File

@ -137,7 +137,7 @@ menu {
&.icon-videos-subscriptions {
position: relative;
top: -2px;
top: -1px;
background-image: url('../../assets/images/menu/subscriptions.svg');
}
@ -148,23 +148,23 @@ menu {
&.icon-videos-trending {
position: relative;
top: -2px;
top: -1px;
background-image: url('../../assets/images/menu/trending.svg');
}
&.icon-videos-recently-added {
width: 23px;
height: 23px;
position: relative;
top: -1px;
background-image: url('../../assets/images/menu/recently-added.svg');
}
&.icon-videos-local {
width: 23px;
height: 23px;
position: relative;
top: -1px;
background-image: url('../../assets/images/menu/home.svg');
}

4
client/src/app/videos/video-list/video-overview.component.html
View File

@ -4,7 +4,7 @@
<div class="section" *ngFor="let object of overview.categories">
<div class="section-title" i18n>
<a routerLink="/search" [queryParams]="{ categoryOneOf: [ object.category.id ] }">Category {{ object.category.label }}</a>
<a routerLink="/search" [queryParams]="{ categoryOneOf: [ object.category.id ] }">{{ object.category.label }}</a>
</div>
<div>
@ -14,7 +14,7 @@
<div class="section" *ngFor="let object of overview.tags">
<div class="section-title" i18n>
<a routerLink="/search" [queryParams]="{ categoryOneOf: [ object.category.id ] }">Tag {{ object.tag }}</a>
<a routerLink="/search" [queryParams]="{ tagOneOf: [ object.tag ] }">{{ object.tag }}</a>
</div>
<div>

13
server/models/utils.ts
View File

@ -4,7 +4,11 @@ type SortType = { sortModel: any, sortValue: string }
// Translate for example "-name" to [ [ 'name', 'DESC' ], [ 'id', 'ASC' ] ]
function getSort (value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
const { direction, field } = buildDirectionAndField(value)
let { direction, field } = buildDirectionAndField(value)
if (field.toLowerCase() === 'match') { // Search
field = Sequelize.col('similarity')
}
return [ [ field, direction ], lastSort ]
}
@ -13,10 +17,9 @@ function getVideoSort (value: string, lastSort: string[] = [ 'id', 'ASC' ]) {
let { direction, field } = buildDirectionAndField(value)
// Alias
if (field.toLowerCase() === 'match') field = Sequelize.col('similarity')
// Sort by aggregation
if (field.toLowerCase() === 'trending') {
if (field.toLowerCase() === 'match') { // Search
field = Sequelize.col('similarity')
} else if (field.toLowerCase() === 'trending') { // Sort by aggregation
return [
[ Sequelize.fn('COALESCE', Sequelize.fn('SUM', Sequelize.col('VideoViews.views')), '0'), direction ],