Browse Source

fix swig related files

Yuki Takei 5 years ago
parent
commit
f5ee6ec7a6

+ 1 - 1
src/server/util/swigFunctions.js

@@ -179,7 +179,7 @@ module.exports = function(crowi, req, locals) {
     return pages.map((page) => {
     return pages.map((page) => {
       return {
       return {
         id: page.id,
         id: page.id,
-        path: entities.encodeHTML(page.path),
+        path: page.path,
         revision: page.revision,
         revision: page.revision,
       };
       };
     });
     });

+ 1 - 1
src/server/views/widget/forbidden_content.html

@@ -8,7 +8,7 @@
 </div>
 </div>
 
 
 <div id="content-main" class="content-main page-list"
 <div id="content-main" class="content-main page-list"
-  data-path="{{ path | preventXss }}"
+  data-path="{{ encodeURI(path) }}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   >
   >
 
 

+ 1 - 1
src/server/views/widget/not_creatable_content.html

@@ -8,7 +8,7 @@
 </div>
 </div>
 
 
 <div id="content-main" class="content-main page-list"
 <div id="content-main" class="content-main page-list"
-  data-path="{{ path | preventXss }}"
+  data-path="{{ encodeURI(path) }}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   >
   >
 
 

+ 1 - 1
src/server/views/widget/not_found_content.html

@@ -8,7 +8,7 @@
 </div>
 </div>
 
 
 <div id="content-main" class="content-main page-list"
 <div id="content-main" class="content-main page-list"
-  data-path="{{ path | preventXss }}"
+  data-path="{{ encodeURI(path) }}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   {% if templateTags %}
   {% if templateTags %}
     data-template-tags="{{ templateTags }}"
     data-template-tags="{{ templateTags }}"

+ 1 - 1
src/server/views/widget/page_alerts.html

@@ -69,7 +69,7 @@
     {% if page and not page.isLatestRevision() %}
     {% if page and not page.isLatestRevision() %}
     <div class="alert alert-warning">
     <div class="alert alert-warning">
       <strong>{{ t('Warning') }}: </strong> {{ t('page_page.notice.version') }}
       <strong>{{ t('Warning') }}: </strong> {{ t('page_page.notice.version') }}
-      <a href="{{ page.path }}"><i class="icon-fw icon-arrow-right-circle"></i>{{ t('Show latest') }}</a>
+      <a href="{{ encodeURI(page.path) }}"><i class="icon-fw icon-arrow-right-circle"></i>{{ t('Show latest') }}</a>
     </div>
     </div>
     {% endif %}
     {% endif %}
 
 

+ 2 - 2
src/server/views/widget/page_content.html

@@ -1,6 +1,6 @@
 {% if page %}
 {% if page %}
 <div id="content-main" class="content-main"
 <div id="content-main" class="content-main"
-  data-path="{{ path }}"
+  data-path="{{ encodeURI(path) }}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   data-page-id="{% if page %}{{ page._id.toString() }}{% endif %}"
   data-page-id="{% if page %}{{ page._id.toString() }}{% endif %}"
   data-page-revision-id="{% if revision %}{{ revision._id.toString() }}{% endif %}"
   data-page-revision-id="{% if revision %}{{ revision._id.toString() }}{% endif %}"
@@ -18,7 +18,7 @@
   >
   >
 {% else %}
 {% else %}
 <div id="content-main" class="content-main"
 <div id="content-main" class="content-main"
-  data-path="{{ path }}"
+  data-path="{{ encodeURI(path) }}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   data-current-user="{% if user %}{{ user._id.toString() }}{% endif %}"
   data-slack-channels="{{ slack|default('') }}"
   data-slack-channels="{{ slack|default('') }}"
   >
   >

+ 2 - 2
src/server/views/widget/page_list.html

@@ -9,9 +9,9 @@
 
 
 <li>
 <li>
   <img src="{{ page.lastUpdateUser|picture }}" class="picture rounded-circle">
   <img src="{{ page.lastUpdateUser|picture }}" class="picture rounded-circle">
-  <a href="{{ page.path }}"
+  <a href="{{ encodeURI(page.path) }}"
     class="text-break"
     class="text-break"
-    data-path="{{ page.path }}">{{ decodeURIComponent(page.path) }}
+    data-path="{{ encodeURI(page.path) }}">{{ page.path | preventXss }}
   </a>
   </a>
   <span class="page-list-meta">
   <span class="page-list-meta">
     {% if page.isTopPage() %}
     {% if page.isTopPage() %}