Merge pull request #100 from weseek/master

release v1.2.4

CHANGES.md

@@ -1,6 +1,10 @@
 CHANGES
 ========
 
+## 1.2.4
+
+* Fix: Internal Server Error has occurred when a guest user visited the page someone added "liked"
+
 ## 1.2.3
 
 * Improvement: Ensure to be enabled to use Presentation Mode even when not logged in

lib/views/crowi-plus/widget/header.html

@@ -18,12 +18,13 @@
         {% endif %}
       </div>
       <div class="flex-item-action visible-xs visible-sm">
+        {% if user %}
         <button
             data-csrftoken="{{ csrf() }}"
             data-liked="{% if page.isLiked(user) %}1{% else %}0{% endif %}"
             class="like-button btn btn-default btn-sm {% if page.isLiked(user) %}active{% endif %}"
-            {% if not user %}disabled{% endif %}
         ><i class="fa fa-thumbs-o-up"></i></button>
+        {% endif %}
       </div>
 
       <ul class="authors visible-md visible-lg">

lib/views/page.html

@@ -24,12 +24,13 @@
         {% endif %}
       </div>
       <div class="flex-item-action visible-xs visible-sm">
+        {% if user %}
         <button
             data-csrftoken="{{ csrf() }}"
             data-liked="{% if page.isLiked(user) %}1{% else %}0{% endif %}"
             class="like-button btn btn-default btn-sm {% if page.isLiked(user) %}active{% endif %}"
-            {% if not user %}disabled{% endif %}
         ><i class="fa fa-thumbs-o-up"></i></button>
+        {% endif %}
       </div>
       {% endif %}
     </div>
@@ -146,8 +147,8 @@
     </li>
     {% if page %}
     <li class="pull-right"><a href="#revision-history" data-toggle="tab"><i class="fa fa-history"></i> History</a></li>
-    {% endif %}
     <li class="pull-right"><a href="?presentation=1" class="toggle-presentation"><i class="fa fa-film"></i> {{ t('Presentation Mode') }}</a></li>
+    {% endif %}
   </ul>
   {% endif %}
 

lib/views/page_list.html

@@ -38,12 +38,13 @@
         {% endif %}
       </div>
       <div class="flex-item-action visible-xs visible-sm">
+        {% if user %}
         <button
             data-csrftoken="{{ csrf() }}"
             data-liked="{% if page.isLiked(user) %}1{% else %}0{% endif %}"
             class="like-button btn btn-default btn-sm {% if page.isLiked(user) %}active{% endif %}"
-            {% if not user %}disabled{% endif %}
         ><i class="fa fa-thumbs-o-up"></i></button>
+        {% endif %}
       </div>
       {% endif %}
     </div>

lib/views/widget/page_side_header.html

@@ -32,12 +32,13 @@
       <dd>
         <p class="liker-count">
         <span id="like-count">{{ page.liker.length }}</span>
+        {% if user %}
         <button
           data-csrftoken="{{ csrf() }}"
           data-liked="{% if page.isLiked(user) %}1{% else %}0{% endif %}"
           class="like-button btn btn-default btn-sm {% if page.isLiked(user) %}active{% endif %}"
-          {% if not user %}disabled{% endif %}
           ><i class="fa fa-thumbs-o-up"></i> {{ t('Like!') }}</button>
+        {% endif %}
         </p>
         <p id="liker-list" class="liker-list" data-likers="{{ page.liker|default([])|join(',') }}">
         </p>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "crowi-plus",
-  "version": "1.2.3-RC",
+  "version": "1.2.4-RC",
   "description": "Enhanced Crowi",
   "tags": [
     "wiki",