From 4776f2fce9a7fd79ad3fca3f449b7d5fc8935521 Mon Sep 17 00:00:00 2001 From: OldHawk Date: Thu, 23 Nov 2017 17:12:10 +0800 Subject: [PATCH] fix(home): optimization torrents sale status showed issues --- .../client/views/maker-view.client.view.html | 2 +- .../views/collection-view.client.view.html | 2 +- .../admin/admin-list.client.controller.js | 14 -------------- .../torrent-info.client.controller.js | 14 -------------- .../controllers/torrents.client.controller.js | 14 -------------- .../torrent-get-info.client.service.js | 19 ++++++++++++++++++- .../views/admin/admin-list.client.view.html | 2 +- .../views/list-torrents.client.view.html | 2 +- .../views/view-torrent.client.view.html | 6 +++--- .../admin/user-leeching.client.view.html | 2 +- .../views/admin/user-seeding.client.view.html | 2 +- .../views/admin/user-uplist.client.view.html | 2 +- .../views/admin/user-warning.client.view.html | 2 +- .../views/status/downloading.client.view.html | 2 +- .../views/status/seeding.client.view.html | 2 +- .../views/status/uploaded.client.view.html | 2 +- .../views/status/warning.client.view.html | 2 +- modules/vip/client/views/vip.client.view.html | 2 +- 18 files changed, 34 insertions(+), 59 deletions(-) diff --git a/modules/about/client/views/maker-view.client.view.html b/modules/about/client/views/maker-view.client.view.html index 54008b38..97c30d50 100644 --- a/modules/about/client/views/maker-view.client.view.html +++ b/modules/about/client/views/maker-view.client.view.html @@ -195,7 +195,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}} {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}} diff --git a/modules/collections/client/views/collection-view.client.view.html b/modules/collections/client/views/collection-view.client.view.html index 5af7ec77..51c91817 100644 --- a/modules/collections/client/views/collection-view.client.view.html +++ b/modules/collections/client/views/collection-view.client.view.html @@ -137,7 +137,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}} {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}} 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 68bdeb68..83fc9b13 100644 --- a/modules/torrents/client/controllers/admin/admin-list.client.controller.js +++ b/modules/torrents/client/controllers/admin/admin-list.client.controller.js @@ -272,20 +272,6 @@ vm.torrentBuildPager(); }; - /** - * getSaleTypeDesc - */ - vm.getSaleTypeDesc = function (item) { - var desc = ''; - - angular.forEach(vm.torrentSalesType.value, function (st) { - if (st.name === item.torrent_sale_status) { - desc = st.desc; - } - }); - return desc; - }; - /** * onMoreTagsClicked */ diff --git a/modules/torrents/client/controllers/torrent-info.client.controller.js b/modules/torrents/client/controllers/torrent-info.client.controller.js index 333c7869..d48c715c 100644 --- a/modules/torrents/client/controllers/torrent-info.client.controller.js +++ b/modules/torrents/client/controllers/torrent-info.client.controller.js @@ -868,20 +868,6 @@ }); }; - /** - * getSaleTypeDesc - */ - vm.getSaleTypeDesc = function () { - var desc = ''; - - angular.forEach(vm.torrentSalesType.value, function (st) { - if (st.name === vm.torrentLocalInfo.torrent_sale_status) { - desc = st.desc; - } - }); - return desc; - }; - /** * deleteTorrent */ diff --git a/modules/torrents/client/controllers/torrents.client.controller.js b/modules/torrents/client/controllers/torrents.client.controller.js index 4ae74496..11abe99c 100644 --- a/modules/torrents/client/controllers/torrents.client.controller.js +++ b/modules/torrents/client/controllers/torrents.client.controller.js @@ -319,20 +319,6 @@ vm.torrentBuildPager(); }; - /** - * getSaleTypeDesc - */ - vm.getSaleTypeDesc = function (item) { - var desc = ''; - - angular.forEach(vm.torrentSalesType.value, function (st) { - if (st.name === item.torrent_sale_status) { - desc = st.desc; - } - }); - return desc; - }; - /** * onMoreTagsClicked */ diff --git a/modules/torrents/client/services/torrent-get-info.client.service.js b/modules/torrents/client/services/torrent-get-info.client.service.js index b679caba..2e60b7eb 100644 --- a/modules/torrents/client/services/torrent-get-info.client.service.js +++ b/modules/torrents/client/services/torrent-get-info.client.service.js @@ -12,6 +12,7 @@ function TorrentGetInfoServices(MeanTorrentConfig, $state) { var voteTitleConfig = MeanTorrentConfig.meanTorrentConfig.voteTitle; var tmdbConfig = MeanTorrentConfig.meanTorrentConfig.tmdbConfig; + var torrentSalesType = MeanTorrentConfig.meanTorrentConfig.torrentSalesType; var service = { getTorrentTitle: getTorrentTitle, @@ -26,7 +27,8 @@ getTorrentLanguage: getTorrentLanguage, getTorrentOverview: getTorrentOverview, - openTorrentDetailInfo: openTorrentDetailInfo + openTorrentDetailInfo: openTorrentDetailInfo, + getTorrentSaleTypeDesc: getTorrentSaleTypeDesc }; return service; @@ -258,5 +260,20 @@ function openTorrentDetailInfo(id) { $state.go('torrents.view', {torrentId: id}); } + + /** + * getTorrentSaleTypeDesc + */ + function getTorrentSaleTypeDesc(item) { + var desc = ''; + + angular.forEach(torrentSalesType.value, function (st) { + if (st.name === item.torrent_sale_status) { + desc = st.desc; + } + }); + return desc; + } + } }()); 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 d89a8e29..77d59fb0 100644 --- a/modules/torrents/client/views/admin/admin-list.client.view.html +++ b/modules/torrents/client/views/admin/admin-list.client.view.html @@ -197,7 +197,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}} {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}} diff --git a/modules/torrents/client/views/list-torrents.client.view.html b/modules/torrents/client/views/list-torrents.client.view.html index a8621d4e..627951e2 100644 --- a/modules/torrents/client/views/list-torrents.client.view.html +++ b/modules/torrents/client/views/list-torrents.client.view.html @@ -208,7 +208,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}} {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}} diff --git a/modules/torrents/client/views/view-torrent.client.view.html b/modules/torrents/client/views/view-torrent.client.view.html index 770d49ac..bf4edc4b 100644 --- a/modules/torrents/client/views/view-torrent.client.view.html +++ b/modules/torrents/client/views/view-torrent.client.view.html @@ -587,7 +587,7 @@
{{ 'VIDEO_SALE_INFO' | translate}}:
{{vm.torrentLocalInfo.torrent_sale_status}} {{vm.torrentLocalInfo.isSaling ? (vm.torrentLocalInfo.torrent_sale_expires | unlife) : ''}} @@ -847,7 +847,7 @@ {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}} @@ -1008,7 +1008,7 @@
{{ 'ADMIN_SALE_TYPE_SET' | translate}}:
- {{vm.getSaleTypeDesc();}} + {{vm.TGI.getTorrentSaleTypeDesc(vm.torrentLocalInfo);}}
diff --git a/modules/users/client/views/admin/user-leeching.client.view.html b/modules/users/client/views/admin/user-leeching.client.view.html index 35d92cbb..4e2732a4 100644 --- a/modules/users/client/views/admin/user-leeching.client.view.html +++ b/modules/users/client/views/admin/user-leeching.client.view.html @@ -94,7 +94,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent.torrent_recommended.toUpperCase() | translate}} {{item.torrent.torrent_sale_status}} {{item.torrent.torrent_sale_expires | unlife}} diff --git a/modules/users/client/views/admin/user-seeding.client.view.html b/modules/users/client/views/admin/user-seeding.client.view.html index 22f293a1..7966f097 100644 --- a/modules/users/client/views/admin/user-seeding.client.view.html +++ b/modules/users/client/views/admin/user-seeding.client.view.html @@ -95,7 +95,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent.torrent_recommended.toUpperCase() | translate}} {{item.torrent.torrent_sale_status}} {{item.torrent.torrent_sale_expires | unlife}} diff --git a/modules/users/client/views/admin/user-uplist.client.view.html b/modules/users/client/views/admin/user-uplist.client.view.html index 30dcc444..b5ac589d 100644 --- a/modules/users/client/views/admin/user-uplist.client.view.html +++ b/modules/users/client/views/admin/user-uplist.client.view.html @@ -90,7 +90,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}} {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}} diff --git a/modules/users/client/views/admin/user-warning.client.view.html b/modules/users/client/views/admin/user-warning.client.view.html index 18912307..2ae1ee97 100644 --- a/modules/users/client/views/admin/user-warning.client.view.html +++ b/modules/users/client/views/admin/user-warning.client.view.html @@ -92,7 +92,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent.torrent_recommended.toUpperCase() | translate}} {{item.torrent.torrent_sale_status}} {{item.torrent.torrent_sale_expires | unlife}} diff --git a/modules/users/client/views/status/downloading.client.view.html b/modules/users/client/views/status/downloading.client.view.html index 53fad0c1..269c44a1 100644 --- a/modules/users/client/views/status/downloading.client.view.html +++ b/modules/users/client/views/status/downloading.client.view.html @@ -94,7 +94,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent.torrent_recommended.toUpperCase() | translate}} {{item.torrent.torrent_sale_status}} {{item.torrent.torrent_sale_expires | unlife}} diff --git a/modules/users/client/views/status/seeding.client.view.html b/modules/users/client/views/status/seeding.client.view.html index 96a7af5d..3a7613ae 100644 --- a/modules/users/client/views/status/seeding.client.view.html +++ b/modules/users/client/views/status/seeding.client.view.html @@ -94,7 +94,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent.torrent_recommended.toUpperCase() | translate}} {{item.torrent.torrent_sale_status}} {{item.torrent.torrent_sale_expires | unlife}} diff --git a/modules/users/client/views/status/uploaded.client.view.html b/modules/users/client/views/status/uploaded.client.view.html index a524cc8a..2adbb44d 100644 --- a/modules/users/client/views/status/uploaded.client.view.html +++ b/modules/users/client/views/status/uploaded.client.view.html @@ -90,7 +90,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}} {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}} diff --git a/modules/users/client/views/status/warning.client.view.html b/modules/users/client/views/status/warning.client.view.html index 2896f506..6832fad0 100644 --- a/modules/users/client/views/status/warning.client.view.html +++ b/modules/users/client/views/status/warning.client.view.html @@ -86,7 +86,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent.torrent_recommended.toUpperCase() | translate}} {{item.torrent.torrent_sale_status}} {{item.torrent.torrent_sale_expires | unlife}} diff --git a/modules/vip/client/views/vip.client.view.html b/modules/vip/client/views/vip.client.view.html index e2fe0ff0..cef2b0db 100644 --- a/modules/vip/client/views/vip.client.view.html +++ b/modules/vip/client/views/vip.client.view.html @@ -135,7 +135,7 @@ {{ 'TORRENT_RECOMMEND_LEVEL_ITEM.' + item.torrent_recommended.toUpperCase() | translate}} {{item.torrent_sale_status}} {{item.torrent_sale_expires | unlife}}