From ea1e800a13be1dbae1d729493e838daced5c4195 Mon Sep 17 00:00:00 2001 From: hylom Date: Tue, 18 Apr 2017 20:32:57 +0900 Subject: [PATCH] Web::Contrroller::Admin::Submissions: /admin/submissions now can show deleted items --- .../Newslash/Web/Controller/Admin/Submissions.pm | 4 +++- src/newslash_web/public/js/submissions-manager.js | 21 ++++++++++++++++++++- .../templates/admin/submissions/index.html.tt2 | 9 +++++---- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/newslash_web/lib/Newslash/Web/Controller/Admin/Submissions.pm b/src/newslash_web/lib/Newslash/Web/Controller/Admin/Submissions.pm index 25635514..9a7d954b 100644 --- a/src/newslash_web/lib/Newslash/Web/Controller/Admin/Submissions.pm +++ b/src/newslash_web/lib/Newslash/Web/Controller/Admin/Submissions.pm @@ -14,7 +14,9 @@ sub list { my $items = []; my $message = ""; - $items = $submissions->select(del => 0); + my $show_deleted = $c->param('show_deleted') ? 1 : 0; + + $items = $submissions->select(del => $show_deleted, limit => 10); if (!$items) { $message = $submissions->last_error; $c->render(json => {message => $message, error => 1}); diff --git a/src/newslash_web/public/js/submissions-manager.js b/src/newslash_web/public/js/submissions-manager.js index 6bed1f69..1bb2eed6 100644 --- a/src/newslash_web/public/js/submissions-manager.js +++ b/src/newslash_web/public/js/submissions-manager.js @@ -6,6 +6,8 @@ submissionsManager.run = function run (params) { const data = { message: '', submissions: [], + status: '', + showDeletedSubjs: false, urls: { update: '/admin/submissions/update', get: '/admin/submissions/get', @@ -15,7 +17,24 @@ submissionsManager.run = function run (params) { }; const computed = {}; const methods = { - updateItem: function editItem(item) { + updateItem: function updateItem(item) { + var url = this.urls.list; + if (this.showDeletedSubjs) { + url = url + '?show_deleted=1' + } + this.$http.get(url).then( + (resp) => { // success + this.submissions = resp.body.items || []; + this.message = resp.body.message || ''; + initItems(this.submissions); + this.status = ""; + }, + (resp) => { // fail + this.boxItems = []; + this.message = resp.body.message || "failed to get items"; + this.status = "update_failed"; + } + ); }, deleteItem: function deleteItem() { const target = []; diff --git a/src/newslash_web/templates/admin/submissions/index.html.tt2 b/src/newslash_web/templates/admin/submissions/index.html.tt2 index 50ae5b6e..ccbee27c 100644 --- a/src/newslash_web/templates/admin/submissions/index.html.tt2 +++ b/src/newslash_web/templates/admin/submissions/index.html.tt2 @@ -2,8 +2,7 @@

Submissions

-
-
+
@@ -30,11 +29,13 @@
- -
+
-- 2.11.0