Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-05-06 10:26:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(torrents): fixed torrent tags filter issue

Browse Source
This commit is contained in:
OldHawk
2018-05-21 23:11:56 +08:00
parent 621f168491
commit e6834243c2
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/about/client/controllers/about.client.controller.js
View File

@@ -313,7 +313,7 @@
skip: (p - 1) * vm.itemsPerPage,
limit: vm.itemsPerPage,
sort: vm.sort,
torrent_type: (vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
torrent_type: (vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
torrent_status: 'reviewed',
maker: vm.maker._id,
keys: vm.searchKey,

4
modules/about/client/views/maker-view.client.view.html
View File

@@ -119,9 +119,9 @@
</div>
<div class="panel-body">
<div class="row filter-tags text-center"
ng-if="vm.filterType!='aggregate' || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
ng-if="(vm.filterType && vm.filterType!='aggregate') || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
<div class="col-md-6 col-md-offset-3">
<span class="filter-tag-item label-tag" ng-if="vm.filterType!='aggregate'">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
<span class="filter-tag-item label-tag" ng-if="vm.filterType && vm.filterType!='aggregate'">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
<i class="fa fa-times-circle-o"
ng-click="vm.onTorrentTypeClicked(vm.filterType);">
</i>

8
modules/torrents/client/controllers/torrents.client.controller.js
View File

@@ -48,6 +48,7 @@
} else {
vm.filterType = vm.torrentType;
}
console.log('vm.filterType = ' + vm.filterType);
});
/**
@@ -311,6 +312,9 @@
//if searchKey or searchTags has value, the skip=0
var skip = 0;
console.log(vm.filterType);
console.log(vm.torrentType);
TorrentsService.get({
skip: (p - 1) * vm.torrentItemsPerPage + skip,
limit: vm.torrentItemsPerPage,
@@ -318,7 +322,7 @@
keys: vm.searchKey.trim(),
torrent_status: 'reviewed',
torrent_rlevel: vm.torrentRLevel,
torrent_type: (vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
torrent_type: (vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
torrent_vip: false,
torrent_release: vm.releaseYear,
torrent_tags: vm.searchTags,
@@ -350,7 +354,7 @@
vm.rssUrl += '?language=' + vm.lang;
vm.rssUrl += '&limit=' + vm.rssConfig.pageItemsNumber;
vm.rssUrl += vm.searchKey.trim() ? '&keys=' + vm.searchKey.trim() : '';
vm.rssUrl += '&torrent_type=' + ((vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType));
vm.rssUrl += '&torrent_type=' + ((vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType));
vm.rssUrl += vm.releaseYear ? '&torrent_release=' + vm.releaseYear : '';
vm.rssUrl += vm.searchTags.length ? '&torrent_tags=' + vm.searchTags : '';
vm.rssUrl += '&torrent_hnr=' + vm.filterHnR;

4
modules/torrents/client/views/list-torrents.client.view.html
View File

@@ -72,9 +72,9 @@
</div>
<div class="panel-body">
<div class="row filter-tags text-center"
ng-if="(vm.filterType!='aggregate' && vm.filterType!=vm.torrentType) || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
ng-if="(vm.filterType && vm.filterType!='aggregate' && vm.filterType!=vm.torrentType) || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
<div class="col-md-6 col-md-offset-3">
<span class="filter-tag-item label-tag" ng-if="vm.filterType!='aggregate' && vm.filterType!=vm.torrentType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
<span class="filter-tag-item label-tag" ng-if="vm.filterType && vm.filterType!='aggregate' && vm.filterType!=vm.torrentType">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
<i class="fa fa-times-circle-o"
ng-click="vm.onTorrentTypeClicked(vm.filterType);">
</i>

4
modules/vip/client/controllers/vip.client.controller.js
View File

@@ -277,7 +277,7 @@
skip: (p - 1) * vm.itemsPerPage,
limit: vm.itemsPerPage,
sort: vm.sort,
torrent_type: (vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
torrent_type: (vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType),
torrent_status: 'reviewed',
torrent_vip: true,
keys: vm.searchKey.trim(),
@@ -305,7 +305,7 @@
vm.rssUrl += '?language=' + localStorageService.get('storage_user_lang');
vm.rssUrl += '&limit=' + vm.rssConfig.pageItemsNumber;
vm.rssUrl += vm.searchKey.trim() ? '&keys=' + vm.searchKey.trim() : '';
vm.rssUrl += '&torrent_type=' + ((vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType));
vm.rssUrl += '&torrent_type=' + ((vm.filterType && vm.filterType !== 'aggregate') ? vm.filterType : (vm.torrentType === 'aggregate' ? 'all' : vm.torrentType));
vm.rssUrl += vm.releaseYear ? '&torrent_release=' + vm.releaseYear : '';
vm.rssUrl += vm.searchTags.length ? '&torrent_tags=' + vm.searchTags : '';
vm.rssUrl += '&torrent_hnr=' + vm.filterHnR;

4
modules/vip/client/views/vip.client.view.html
View File

@@ -37,9 +37,9 @@
</div>
<div class="panel-body">
<div class="row filter-tags text-center"
ng-if="vm.filterType!='aggregate' || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
ng-if="(vm.filterType && vm.filterType!='aggregate') || vm.releaseYear || vm.torrentRLevel != 'level0' || vm.filterSale || vm.filterHnR || vm.filterTop || vm.filterUnique || vm.searchTags.length>0">
<div class="col-md-6 col-md-offset-3">
<span class="filter-tag-item label-tag" ng-if="vm.filterType!='aggregate'">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
<span class="filter-tag-item label-tag" ng-if="vm.filterType && vm.filterType!='aggregate'">{{'TORRENT_TYPE_LABEL.' + vm.filterType.toUpperCase() | translate}}
<i class="fa fa-times-circle-o"
ng-click="vm.onTorrentTypeClicked(vm.filterType);">
</i>