From 07abc1eb3b2ac45ce9dfbf3395ccff6149d97df1 Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 2 Dec 2017 20:06:38 +0800
Subject: [PATCH] feat(torrents): Add 'All Newest Torrents' in resources type
 list option of torrent manage admin page

Admin can directly management all newest torrents of all category at here. but this is not the default selected category.

#20
---
 README.md                                     |  3 +-
 modules/core/client/app/trans-string-en.js    |  1 +
 modules/core/client/app/trans-string-zh.js    |  1 +
 .../admin/admin-list.client.controller.js     |  4 +-
 .../views/admin/admin-list.client.view.html   | 58 +++++++++++--------
 5 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 43cb2f0b..f38756f3 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,8 @@ and [AngularJS](http://angularjs.org/) based applications.
 39. Auto get search movie/tvserial result from TMDB by keywords, user can select a result item to load resources info and upload.
 40. Admin can configure to hide all menu header for guest users, usefully for private tracker mode.
 41. Complete emoji support in markdown content, The images for the emoji can be found in the [emoji-cheat-sheet](https://www.webpagefx.com/tools/emoji-cheat-sheet/).
-42. complete forum for vip and oper/admin users only, Special access forums not show to normal users.
+42. Complete forum for vip and oper/admin users only, Special access forums not show to normal users.
+43. Add 'All Newest Torrents' in resources type list option of torrent manage admin page, admin can directly management all newest torrents of all category.
 
 #### Chat room feature:
 1. Users name list
diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js
index 65c00d05..65acd00c 100644
--- a/modules/core/client/app/trans-string-en.js
+++ b/modules/core/client/app/trans-string-en.js
@@ -453,6 +453,7 @@
     //admin views
     USERS_LIST: 'Users',
     USERS_UPDATE: 'Update',
+    TORRENT_TYPE_OPTION_NEWEST: 'All Newest Torrents',
     TORRENT_STATUS_NEW: 'NEW',
     TORRENT_STATUS_REVIEWED: 'REVIEWED',
     TORRENT_STATUS_DELETED: 'DELETED',
diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js
index 0df3de4f..210f26dd 100644
--- a/modules/core/client/app/trans-string-zh.js
+++ b/modules/core/client/app/trans-string-zh.js
@@ -453,6 +453,7 @@
     //admin views
     USERS_LIST: '用户列表',
     USERS_UPDATE: '修改',
+    TORRENT_TYPE_OPTION_NEWEST: '所有示审核的种子',
     TORRENT_STATUS_NEW: '未审核',
     TORRENT_STATUS_REVIEWED: '已审核',
     TORRENT_STATUS_DELETED: '已删除',
diff --git a/modules/torrents/client/controllers/admin/admin-list.client.controller.js b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
index 83fc9b13..21a0f65f 100644
--- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js
+++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js
@@ -180,9 +180,9 @@
         skip: (p - 1) * vm.torrentItemsPerPage,
         limit: vm.torrentItemsPerPage,
         keys: vm.searchKey.trim(),
-        torrent_status: vm.torrentStatus,
+        torrent_status: vm.selectedType === 'newest' ? 'new' : vm.torrentStatus,
         torrent_rlevel: vm.torrentRLevel,
-        torrent_type: vm.selectedType,
+        torrent_type: vm.selectedType === 'newest' ? 'all' : vm.selectedType,
         torrent_release: vm.releaseYear,
         torrent_tags: vm.searchTags,
         torrent_hnr: vm.filterHnR,
diff --git a/modules/torrents/client/views/admin/admin-list.client.view.html b/modules/torrents/client/views/admin/admin-list.client.view.html
index 77d59fb0..8e9f8b32 100644
--- a/modules/torrents/client/views/admin/admin-list.client.view.html
+++ b/modules/torrents/client/views/admin/admin-list.client.view.html
@@ -11,6 +11,8 @@
                         <div class="row margin-bottom-5">
                             <div class="col-sm-6 col-md-4">
                                 <select class="form-control" ng-model="vm.selectedType" ng-change="vm.onTorrentTypeChanged();">
+                                    <option value="newest">{{'TORRENT_TYPE_OPTION_NEWEST' | translate}}
+                                    </option>
                                     <option ng-repeat="t in vm.torrentType.value | filter:{enable: true}"
                                             value="{{t.value}}">{{'MENU_TORRENTS_SUB.'+t.name | translate}}
                                     </option>
@@ -61,29 +63,31 @@
                         </div>
                     </dd>
 
-                    <dt class="h-line">{{ 'CA_TORRENT_STATUS' | translate}}:</dt>
-                    <dd class="h-line">
-                        <div class="btn-group btn-group-xs" role="group">
-                            <button id="torrent_status_reviewed"
-                                    class="btn btn-xs btn-tag" value="reviewed"
-                                    ng-class="{'btn-success': vm.torrentStatus == 'reviewed', 'btn-default': vm.torrentStatus != 'reviewed'}"
-                                    ng-click="vm.onTorrentStatusClicked($event, 'reviewed')">
-                                {{'TORRENT_STATUS_REVIEWED' | translate}}
-                            </button>
-                            <button id="torrent_status_new"
-                                    class="btn btn-xs btn-tag" value="new"
-                                    ng-class="{'btn-success': vm.torrentStatus == 'new', 'btn-default': vm.torrentStatus != 'new'}"
-                                    ng-click="vm.onTorrentStatusClicked($event, 'new')">
-                                {{'TORRENT_STATUS_NEW' | translate}}
-                            </button>
-                            <button id="torrent_status_all"
-                                    class="btn btn-xs btn-tag" value="all"
-                                    ng-class="{'btn-success': vm.torrentStatus == 'all', 'btn-default': vm.torrentStatus != 'all'}"
-                                    ng-click="vm.onTorrentStatusClicked($event, 'all')">
-                                {{'TORRENT_STATUS_ALL' | translate}}
-                            </button>
-                        </div>
-                    </dd>
+                    <div ng-hide="vm.selectedType=='newest'">
+                        <dt class="h-line">{{ 'CA_TORRENT_STATUS' | translate}}:</dt>
+                        <dd class="h-line">
+                            <div class="btn-group btn-group-xs" role="group">
+                                <button id="torrent_status_reviewed"
+                                        class="btn btn-xs btn-tag" value="reviewed"
+                                        ng-class="{'btn-success': vm.torrentStatus == 'reviewed', 'btn-default': vm.torrentStatus != 'reviewed'}"
+                                        ng-click="vm.onTorrentStatusClicked($event, 'reviewed')">
+                                    {{'TORRENT_STATUS_REVIEWED' | translate}}
+                                </button>
+                                <button id="torrent_status_new"
+                                        class="btn btn-xs btn-tag" value="new"
+                                        ng-class="{'btn-success': vm.torrentStatus == 'new', 'btn-default': vm.torrentStatus != 'new'}"
+                                        ng-click="vm.onTorrentStatusClicked($event, 'new')">
+                                    {{'TORRENT_STATUS_NEW' | translate}}
+                                </button>
+                                <button id="torrent_status_all"
+                                        class="btn btn-xs btn-tag" value="all"
+                                        ng-class="{'btn-success': vm.torrentStatus == 'all', 'btn-default': vm.torrentStatus != 'all'}"
+                                        ng-click="vm.onTorrentStatusClicked($event, 'all')">
+                                    {{'TORRENT_STATUS_ALL' | translate}}
+                                </button>
+                            </div>
+                        </dd>
+                    </div>
 
                     <dt class="h-line">{{ 'TORRENT_RECOMMEND_LEVEL' | translate}}:</dt>
                     <dd class="h-line">
@@ -187,6 +191,14 @@
 
                                     <div class="list-all-tags">
                                         <!--<span class="label label-success text-uppercase">{{ item.torrent_type}}</span>-->
+                                        <span class="label label-ttype label-primary" ng-click="$event.stopPropagation();"
+                                              ng-if="vm.selectedType=='newest'">
+                                            {{'TORRENT_TYPE_LABEL.' + item.torrent_type.toUpperCase() | translate}}
+                                        </span>
+                                        <span class="label label-tstatus label-danger" ng-show="item.torrent_status == 'new'"
+                                              ng-click="$event.stopPropagation();">
+                                            {{'TORRENT_STATUS_LABEL.' + item.torrent_status.toUpperCase() | translate}}
+                                        </span>
                                         <span class="label label-release label-warning" ng-show="item.resource_detail_info.release_date"
                                               ng-click="vm.onReleaseClicked(item.resource_detail_info.release_date); $event.stopPropagation();">
                                             {{ item.resource_detail_info.release_date}}