Merge branch 'jerone-headings'

OpenUserJS · Jun 18, 2014 · 4900e85 · 4900e85
2 parents cab2330 + 9faa4f5
commit 4900e85
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/controllers/index.js b/controllers/index.js
@@ -99,6 +99,13 @@ exports.home = function (req, res) {
     } else if (options.isUserScriptListPage) {
       options.scriptListIsEmptyMessage = 'This user hasn\'t added any scripts yet.';
     }
+
+    // Heading
+    if (options.librariesOnly) {
+      options.pageHeading = options.isFlagged ? 'Flagged Libraries' : 'Libraries';
+    } else {
+      options.pageHeading = options.isFlagged ? 'Flagged Scripts' : 'Scripts';
+    }
   };
   function render(){ res.render('pages/scriptListPage', options); }
   function asyncComplete(){ preRender(); render(); }

diff --git a/controllers/user.js b/controllers/user.js
@@ -188,6 +188,9 @@ exports.userListPage = function (req, res, next) {
     } else if (options.searchBarValue) {
       options.userListIsEmptyMessage = 'We couldn\'t find any users by this name.';
     }
+
+    // Heading
+    options.pageHeading = options.isFlagged ? 'Flagged Users' : 'Users';
   };
   function render(){ res.render('pages/userListPage', options); }
   function asyncComplete(err){ if (err) { return next(); } else { preRender(); render(); } };

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

diff --git a/views/pages/scriptListPage.html b/views/pages/scriptListPage.html
@@ -10,8 +10,7 @@
     <div class="row">
       <div class="col-sm-8">
         <h2 class="page-heading">
-          {{^librariesOnly}}Scripts{{/librariesOnly}}
-          {{#librariesOnly}}Libraries{{/librariesOnly}}
+          {{pageHeading}}
         </h2>
         <div class="panel panel-default">
           {{> includes/scriptList.html }}

diff --git a/views/pages/userListPage.html b/views/pages/userListPage.html
@@ -10,7 +10,7 @@
     <div class="row">
       <div class="col-sm-8">
         <h2 class="page-heading">
-          Users
+          {{pageHeading}}
         </h2>
         <div class="panel panel-default">
           {{> includes/userList.html }}