From be03dc0cb6feea2165de12a4fef16bfcd5ea2315 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Fri, 26 May 2017 14:33:05 +0800 Subject: [PATCH] feat(status): load torrent_status data --- modules/core/client/app/trans-string-en.js | 5 +++++ modules/core/client/app/trans-string-zh.js | 4 ++++ modules/core/client/less/mt.less | 7 +++++++ .../controllers/status/uploaded.client.controller.js | 3 ++- .../users/client/views/status/uploaded.client.view.html | 4 ++++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 6ea82fef..4db77870 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -343,6 +343,11 @@ MUSIC: 'Music', OTHER: 'Other' }, + TORRENT_STATUS_LABEL: { + NEW: 'New', + REVIEWED: 'Reviewed', + }, + //user message box MESSAGES_INBOX: 'Messages Inbox', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index a42c6378..b7298bc0 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -343,6 +343,10 @@ MUSIC: '音乐', OTHER: '其它' }, + TORRENT_STATUS_LABEL: { + NEW: '未审核', + REVIEWED: '已审核', + }, //user message box MESSAGES_INBOX: '消息收件箱', diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index c387bf6c..2f8e820b 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -576,6 +576,13 @@ body { } } +.label-tstatus { + &:hover { + cursor: pointer; + color: #fff; + } +} + .label-sale { &:hover { cursor: pointer; diff --git a/modules/users/client/controllers/status/uploaded.client.controller.js b/modules/users/client/controllers/status/uploaded.client.controller.js index c3aaf7da..7c86ea91 100644 --- a/modules/users/client/controllers/status/uploaded.client.controller.js +++ b/modules/users/client/controllers/status/uploaded.client.controller.js @@ -74,7 +74,8 @@ vm.getUploadedTorrend = function () { TorrentsService.get({ userid: vm.user._id, - torrent_type: 'all' + torrent_type: 'all', + torrent_status: 'all' }, function (items) { vm.uploadedList = items.rows; vm.buildPager(); diff --git a/modules/users/client/views/status/uploaded.client.view.html b/modules/users/client/views/status/uploaded.client.view.html index bd5dca98..4ae05ac1 100644 --- a/modules/users/client/views/status/uploaded.client.view.html +++ b/modules/users/client/views/status/uploaded.client.view.html @@ -59,6 +59,10 @@ {{'TORRENT_TYPE_LABEL.' + item.torrent_type.toUpperCase() | translate}} + + {{'TORRENT_STATUS_LABEL.' + item.torrent_status.toUpperCase() | translate}} + {{ item.resource_detail_info.release_date}}