Merge pull request #623 from Martii/Issue-615

Add "All" filter to script issues

Auto-merge

Author: Martii

controllers/issue.js

@@ -31,6 +31,7 @@ exports.list = function (aReq, aRes, aNext) {
   var username = aReq.params.username;
   var scriptname = aReq.params.scriptname;
   var open = aReq.params.open !== 'closed';
+  var listAll = aReq.params.open === 'all';
 
   var installNameSlug = username + '/' + scriptname;
 
@@ -85,8 +86,11 @@ exports.list = function (aReq, aRes, aNext) {
     // discussionListQuery: category
     discussionListQuery.find({ category: category.slug });
 
-    // discussionListQuery: open
-    modelQuery.findOrDefaultIfNull(discussionListQuery, 'open', options.openIssuesOnly, true);
+    // discussionListQuery: Optionally filter discussion list
+    options.allIssues = !aReq.params.open && !options.isOwner || listAll;
+    if (!options.allIssues) {
+      modelQuery.findOrDefaultIfNull(discussionListQuery, 'open', options.openIssuesOnly, true);
+    }
 
     // discussionListQuery: Defaults
     modelQuery.applyDiscussionListQueryDefaults(discussionListQuery, options, aReq);
@@ -100,7 +104,10 @@ exports.list = function (aReq, aRes, aNext) {
     //--- Tasks
 
     // Show the number of open issues
-    var scriptOpenIssueCountQuery = Discussion.find({ category: script.issuesCategorySlug, open: { $ne: false } });
+    var scriptOpenIssueCountQuery = Discussion.find({
+      category: script.issuesCategorySlug,
+      open: { $ne: false }
+    });
     tasks.push(countTask(scriptOpenIssueCountQuery, options, 'issueCount'));
 
     // Pagination
@@ -121,16 +128,24 @@ exports.list = function (aReq, aRes, aNext) {
 
       // Empty list
       if (options.searchBarValue) {
-        if (open) {
-          options.discussionListIsEmptyMessage = 'We couldn\'t find any open discussions with this search value.';
+        if (options.allIssues) {
+          options.discussionListIsEmptyMessage = 'We couldn\'t find any discussions with this search value.';
         } else {
-          options.discussionListIsEmptyMessage = 'We couldn\'t find any closed discussions with this search value.';
+          if (open) {
+            options.discussionListIsEmptyMessage = 'We couldn\'t find any open discussions with this search value.';
+          } else {
+            options.discussionListIsEmptyMessage = 'We couldn\'t find any closed discussions with this search value.';
+          }
         }
       } else {
-        if (open) {
-          options.discussionListIsEmptyMessage = 'No open discussions.';
+        if (options.allIssues) {
+          options.discussionListIsEmptyMessage = 'No discussions.';
         } else {
-          options.discussionListIsEmptyMessage = 'No closed discussions.';
+          if (open) {
+            options.discussionListIsEmptyMessage = 'No open discussions.';
+          } else {
+            options.discussionListIsEmptyMessage = 'No closed discussions.';
+          }
         }
       }
     }
@@ -204,7 +219,10 @@ exports.view = function (aReq, aRes, aNext) {
       //--- Tasks
 
       // Show the number of open issues
-      var scriptOpenIssueCountQuery = Discussion.find({ category: script.issuesCategorySlug, open: { $ne: false } }); // TODO: STYLEGUIDE.md conformance needed here
+      var scriptOpenIssueCountQuery = Discussion.find({
+        category: script.issuesCategorySlug,
+        open: { $ne: false }
+      });
       tasks.push(countTask(scriptOpenIssueCountQuery, options, 'issueCount'));
 
       // Pagination

routes.js

@@ -83,7 +83,7 @@ module.exports = function (aApp) {
   aApp.route('/libs/src/:username/:scriptname').get(scriptStorage.sendScript); // Legacy
 
   // Issues routes
-  aApp.route('/:type(scripts|libs)/:username/:namespace?/:scriptname/issues/:open(closed)?').get(issue.list);
+  aApp.route('/:type(scripts|libs)/:username/:namespace?/:scriptname/issues/:open(open|closed|all)?').get(issue.list);
   aApp.route('/:type(scripts|libs)/:username/:namespace?/:scriptname/issue/new').get(authentication.validateUser, issue.open).post(authentication.validateUser, issue.open);
   aApp.route('/:type(scripts|libs)/:username/:namespace?/:scriptname/issues/:topic').get(issue.view).post(authentication.validateUser, issue.comment);
   aApp.route('/:type(scripts|libs)/:username/:namespace?/:scriptname/issues/:topic/:action(close|reopen)').get(authentication.validateUser, issue.changeStatus);

views/pages/scriptIssueListPage.html

@@ -48,8 +48,9 @@
         <div class="panel">
           <div class="panel-body">
             <ul class="nav nav-pills nav-justified">
-              <li class="{{#openIssuesOnly}}active{{/openIssuesOnly}}"><a href="{{{category.categoryPageUrl}}}">Open</a></li>
-              <li class="{{^openIssuesOnly}}active{{/openIssuesOnly}}"><a href="{{{category.categoryPageUrl}}}/closed">Closed</a></li>
+              <li class="{{^allIssues}}{{#openIssuesOnly}}active{{/openIssuesOnly}}{{/allIssues}}"><a href="{{{category.categoryPageUrl}}}/open">Open</a></li>
+              <li class="{{^allIssues}}{{^openIssuesOnly}}active{{/openIssuesOnly}}{{/allIssues}}"><a href="{{{category.categoryPageUrl}}}/closed">Closed</a></li>
+              <li class="{{#allIssues}}active{{/allIssues}}"><a href="{{{category.categoryPageUrl}}}/all">All</a></li>
             </ul>
           </div>
         </div>