diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 9ab98f06..aaf60091 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -122,6 +122,7 @@ MOVIE_PAGE_INFO_EMPTY: 'No movie founded, please change some new tags to research', TAGS_SEARCH: 'Tags Search', CA_KEYWORD: 'Keyword', + CA_TORRENT_STATUS: 'Torrent status', PH_KEYWORD: 'Search keyword', CLEAR_ALL_CONDITION: 'Clear All Condition', MORE_TAGS: 'More Tags', @@ -175,6 +176,7 @@ OTHER_TORRENT_LIST_TITLE: 'This resources has {{x}} other version torrent, you can view or download from here:', ADMIN_BASIC_COMMAND: 'Basic Command', + ADMIN_BASIC_REVIEWED: 'Reviewed', ADMIN_BASIC_DELETE: 'Delete torrent', ADMIN_BASIC_TYPE_SET: 'Sale Type', ADMIN_SALE_TYPE_SET: 'Sale Type Set', @@ -187,6 +189,8 @@ TORRENT_DELETE_ERROR: 'Torrent delete failed', TORRENT_SETSALETYPE_SUCCESSFULLY: 'Torrent sale type set successfully', TORRENT_SETSALETYPE_ERROR: 'Torrent sale type set failed', + TORRENT_SETREVIEWED_SUCCESSFULLY: 'Torrent status reviewed set successfully', + TORRENT_SETREVIEWED_ERROR: 'Torrent status reviewed set failed', //page text PAGE_TEXT_FIRST: 'First', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 41f7b690..af4ce86a 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -122,6 +122,7 @@ MOVIE_PAGE_INFO_EMPTY: '没有找到信息,请更换标签重新检索', TAGS_SEARCH: '标签检索', CA_KEYWORD: '关键字', + CA_TORRENT_STATUS: '种子状态', PH_KEYWORD: '搜索关键字', CLEAR_ALL_CONDITION: '清空所有条件', MORE_TAGS: '显示更多标签', @@ -175,6 +176,7 @@ OTHER_TORRENT_LIST_TITLE: '该资源有 {{x}} 个其它版本的种子, 你可以从下面查看或直接下载:', ADMIN_BASIC_COMMAND: '操作命令', + ADMIN_BASIC_REVIEWED: '通过审核', ADMIN_BASIC_DELETE: '删除种子', ADMIN_BASIC_TYPE_SET: '设置促销', ADMIN_SALE_TYPE_SET: '种子促销类型', @@ -187,6 +189,8 @@ TORRENT_DELETE_ERROR: '种子信息删除失败', TORRENT_SETSALETYPE_SUCCESSFULLY: '种子促销类型设置成功', TORRENT_SETSALETYPE_ERROR: '种子促销类型设置失败', + TORRENT_SETREVIEWED_SUCCESSFULLY: '种子审核状态设置成功', + TORRENT_SETREVIEWED_ERROR: '种子审核状态设置失败', //page text PAGE_TEXT_FIRST: '首页', diff --git a/modules/core/client/less/margin.less b/modules/core/client/less/margin.less index d97e6f0f..723e17d5 100644 --- a/modules/core/client/less/margin.less +++ b/modules/core/client/less/margin.less @@ -1,3 +1,7 @@ +.margin-top-2 { + margin-top: 2px; +} + .margin-top-10 { margin-top: 10px; } diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index c94ad78c..3fb87e53 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -569,4 +569,9 @@ border-top: solid 1px lighten(@gray-light, 35%); margin-top: 5px; padding-top: 5px; +} + +.upload-by { + color: #888; + font-size: 12px; } \ No newline at end of file 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 fb990a2e..f0abd65c 100644 --- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js +++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js @@ -22,6 +22,7 @@ vm.searchKey = ''; vm.releaseYear = undefined; vm.topItems = 6; + vm.torrentStatus = 'reviewed'; /** * If user is not signed in then redirect back home @@ -72,6 +73,25 @@ }); }; + /** + * onTorrentStatusClicked + * @param event + * @param s: status value + */ + vm.onTorrentStatusClicked = function (event, s) { + var e = angular.element(event.currentTarget); + + //if (e.hasClass('btn-success')) { + // return; + //} else { + // e.addClass('btn-success').removeClass('btn-default').siblings().removeClass('btn-success').addClass('btn-default'); + // vm.torrentStatus = s; + //} + vm.torrentStatus = s; + e.blur(); + vm.torrentBuildPager(); + }; + /** * onRadioTagClicked * @param event @@ -132,7 +152,7 @@ skip: (p - 1) * vm.torrentItemsPerPage, limit: vm.torrentItemsPerPage, keys: vm.searchKey.trim(), - torrent_status: 'reviewed', + torrent_status: vm.torrentStatus, torrent_type: 'movie', torrent_release: vm.releaseYear, torrent_tags: vm.searchTags @@ -334,5 +354,26 @@ }); }); }; + + /** + * reviewedTorrentStatus + * @param item + */ + vm.reviewedTorrentStatus = function (item) { + TorrentsService.setReviewedStatus({ + _torrentId: item._id + }, function (res) { + Notification.success({ + message: ' ' + $translate.instant('TORRENT_SETREVIEWED_SUCCESSFULLY') + }); + + vm.torrentPagedItems[vm.torrentPagedItems.indexOf(item)] = res; + }, function (res) { + Notification.error({ + message: res.data.message, + title: ' ' + $translate.instant('TORRENT_SETREVIEWED_ERROR') + }); + }); + }; } }()); diff --git a/modules/torrents/client/services/torrents.client.service.js b/modules/torrents/client/services/torrents.client.service.js index fdd30a1b..b8482f37 100644 --- a/modules/torrents/client/services/torrents.client.service.js +++ b/modules/torrents/client/services/torrents.client.service.js @@ -30,6 +30,13 @@ torrentId: '@_torrentId', saleType: '@_saleType' } + }, + setReviewedStatus: { + method: 'PUT', + url: '/api/torrents/:torrentId/set/reviewed', + params: { + torrentId: '@_torrentId' + } } }); 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 4f4b09c1..6e12347c 100644 --- a/modules/torrents/client/views/admin/admin-list.client.view.html +++ b/modules/torrents/client/views/admin/admin-list.client.view.html @@ -30,6 +30,31 @@ +