Merge pull request #179 from jerone/issue-178

Differ from flagged listings; Fixes #178
OpenUserJS · Jun 18, 2014 · cab2330 · cab2330
2 parents b5877be + 7384999
commit cab2330
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 15 deletions.
diff --git a/controllers/group.js b/controllers/group.js
@@ -288,6 +288,24 @@ exports.view = function (req, res, next) {
       if (options.groupList)
         pageMetaKeywords.push(group.name);
       options.pageMetaKeywords = pageMetaKeywords.join(', ');
+
+      // Empty list
+      options.scriptListIsEmptyMessage = 'No scripts.';
+      if (options.isFlagged) {
+        if (options.librariesOnly) {
+          options.scriptListIsEmptyMessage = 'No flagged libraries.';
+        } else {
+          options.scriptListIsEmptyMessage = 'No flagged scripts.';
+        }
+      } else if (options.searchBarValue) {
+        if (options.librariesOnly) {
+          options.scriptListIsEmptyMessage = 'We couldn\'t find any libraries with this search value.';
+        } else {
+          options.scriptListIsEmptyMessage = 'We couldn\'t find any scripts with this search value.';
+        }
+      } else if (options.isUserScriptListPage) {
+        options.scriptListIsEmptyMessage = 'This user hasn\'t added any scripts yet.';
+      }
     };
     function render(){ res.render('pages/groupScriptListPage', options); }
     function asyncComplete(){ preRender(); render(); }

diff --git a/controllers/index.js b/controllers/index.js
@@ -81,6 +81,24 @@ exports.home = function (req, res) {
 
     // Pagination
     options.paginationRendered = pagination.renderDefault(req);
+
+    // Empty list
+    options.scriptListIsEmptyMessage = 'No scripts.';
+    if (options.isFlagged) {
+      if (options.librariesOnly) {
+        options.scriptListIsEmptyMessage = 'No flagged libraries.';
+      } else {
+        options.scriptListIsEmptyMessage = 'No flagged scripts.';
+      }
+    } else if (options.searchBarValue) {
+      if (options.librariesOnly) {
+        options.scriptListIsEmptyMessage = 'We couldn\'t find any libraries with this search value.';
+      } else {
+        options.scriptListIsEmptyMessage = 'We couldn\'t find any scripts with this search value.';
+      }
+    } else if (options.isUserScriptListPage) {
+      options.scriptListIsEmptyMessage = 'This user hasn\'t added any scripts yet.';
+    }
   };
   function render(){ res.render('pages/scriptListPage', options); }
   function asyncComplete(){ preRender(); render(); }
@@ -250,7 +268,7 @@ exports.logout = function (req, res) {
 
   User.findOne({ _id: authedUser._id }, function (err, user) {
     removeSession(req, user, function () {
-      res.redirect('/'); 
+      res.redirect('/');
     });
   });
 };
diff --git a/controllers/user.js b/controllers/user.js
@@ -180,6 +180,14 @@ exports.userListPage = function (req, res, next) {
 
     // Pagination
     options.paginationRendered = pagination.renderDefault(req);
+
+    // Empty list
+    options.userListIsEmptyMessage = 'No users.';
+    if (options.isFlagged) {
+      options.userListIsEmptyMessage = 'No flagged users.';
+    } else if (options.searchBarValue) {
+      options.userListIsEmptyMessage = 'We couldn\'t find any users by this name.';
+    }
   };
   function render(){ res.render('pages/userListPage', options); }
   function asyncComplete(err){ if (err) { return next(); } else { preRender(); render(); } };
@@ -399,6 +407,24 @@ exports.userScriptListPage = function(req, res, next) {
 
       // Pagination
       options.paginationRendered = pagination.renderDefault(req);
+
+      // Empty list
+      options.scriptListIsEmptyMessage = 'No scripts.';
+      if (options.isFlagged) {
+        if (options.librariesOnly) {
+          options.scriptListIsEmptyMessage = 'No flagged libraries.';
+        } else {
+          options.scriptListIsEmptyMessage = 'No flagged scripts.';
+        }
+      } else if (options.searchBarValue) {
+        if (options.librariesOnly) {
+          options.scriptListIsEmptyMessage = 'We couldn\'t find any libraries with this search value.';
+        } else {
+          options.scriptListIsEmptyMessage = 'We couldn\'t find any scripts with this search value.';
+        }
+      } else if (options.isUserScriptListPage) {
+        options.scriptListIsEmptyMessage = 'This user hasn\'t added any scripts yet.';
+      }
     };
     function render(){ res.render('pages/userScriptListPage', options); }
     function asyncComplete(){ preRender(); render(); }

diff --git a/libs/modelQuery.js b/libs/modelQuery.js
@@ -133,6 +133,7 @@ var applyModelListQueryFlaggedFilter = function(modelListQuery, options, flagged
     // Mod
     if (flaggedQuery) {
       if (flaggedQuery == 'true') {
+        options.isFlagged = true;
         modelListQuery.and({flags: {$gt: 0 }});
       } else if (flaggedQuery == false) {
         // modelListQuery.and({$or: [

diff --git a/views/includes/scriptList.html b/views/includes/scriptList.html
@@ -40,17 +40,7 @@
     {{^scriptList}}
     <tr class="tr-link">
       <td colspan="4">
-        {{#searchBarValue}}
-        {{#librariesOnly}}
-        <em>We couldn't find any libraries with this search value.</em>
-        {{/librariesOnly}}
-        {{^librariesOnly}}
-        <em>We couldn't find any scripts with this search value.</em>
-        {{/librariesOnly}}
-        {{/searchBarValue}}
-        {{^searchBarValue}}
-        <em>This user hasn't added any scripts yet.</em>
-        {{/searchBarValue}}
+        <em>{{scriptListIsEmptyMessage}}</em>
       </td>
     </tr>
     {{/scriptList}}

diff --git a/views/includes/userList.html b/views/includes/userList.html
@@ -23,9 +23,7 @@
     {{^userList}}
     <tr class="tr-link">
       <td colspan="4">
-        {{#searchBarValue}}
-        <em>We couldn't find any users by this name.</em>
-        {{/searchBarValue}}
+        <em>{{userListIsEmptyMessage}}</em>
       </td>
     </tr>
     {{/userList}}