Merge pull request #108 from crowi/fix-user-pages-user-variable

Fix: User page's variable

lib/routes/page.js

@@ -430,7 +430,7 @@ module.exports = function(crowi, app) {
       if (user === null) {
         throw new Error('The user not found.');
       }
-      renderVars.user = user;
+      renderVars.pageUser = user;
 
       return Bookmark.findByUser(user, queryOptions);
     }).then(function(bookmarks) {
@@ -468,7 +468,7 @@ module.exports = function(crowi, app) {
       if (user === null) {
         throw new Error('The user not found.');
       }
-      renderVars.user = user;
+      renderVars.pageUser = user;
 
       return Page.findListByCreator(user, queryOptions);
     }).then(function(pages) {

lib/views/user/bookmarks.html

@@ -2,14 +2,14 @@
 
 {% block main_css_class %}bookmark-page{% endblock %}
 
-{% block html_title %}{{ user.name }}'s Bookmarks · {% endblock %}
+{% block html_title %}{{ pageUser.name }}'s Bookmarks · {% endblock %}
 
 {% block content_head %}
 <div class="header-wrap">
   <header id="page-header">
     <p class="stopper"><a href="#" data-affix-disable="#page-header"><i class="fa fa-chevron-up"></i></a></p>
 
-    <h1 class="title">{{ user.name }}'s Bookmarks</h1>
+    <h1 class="title">{{ pageUser.name }}'s Bookmarks</h1>
   </header>
 </div>
 {% endblock %}

lib/views/user/recent-create.html

@@ -2,14 +2,14 @@
 
 {% block main_css_class %}recent-create-page{% endblock %}
 
-{% block html_title %}{{ user.name }}'s Recent Created Pages 揃 {% endblock %}
+{% block html_title %}{{ pageUser.name }}'s Recent Created Pages 揃 {% endblock %}
 
 {% block content_head %}
 <div class="header-wrap">
   <header id="page-header">
     <p class="stopper"><a href="#" data-affix-disable="#page-header"><i class="fa fa-chevron-up"></i></a></p>
 
-    <h1 class="title">{{ user.name }}'s Created Pages</h1>
+    <h1 class="title">{{ pageUser.name }}'s Created Pages</h1>
   </header>
 </div>
 {% endblock %}