Преглед изворни кода

Implv/125 Selective batch deletion in search result page
* Change pick up csrf token data source from main-container id to body tag.
* Delete csrf token data whitch included in content-main.

Tatsuya Ise пре 8 година
родитељ
комит
6e77550f03
5 измењених фајлова са 3 додато и 6 уклоњено
  1. 1 1
      lib/views/layout/layout.html
  2. 0 1
      lib/views/not_found.html
  3. 0 1
      lib/views/page.html
  4. 0 1
      lib/views/page_list.html
  5. 2 2
      resource/js/app.js

+ 1 - 1
lib/views/layout/layout.html

@@ -65,7 +65,7 @@
 {% endblock %}
 
 {% block html_body %}
-<body id="main-container"
+<body
   class="crowi main-container {% block html_base_css %}{% endblock %} {% if 'crowi-plus' === layoutType() %}crowi-plus{% endif %}"
   data-me="{{ user._id.toString() }}"
   data-plugin-enabled="{{ isEnabledPlugins() }}"

+ 0 - 1
lib/views/not_found.html

@@ -43,7 +43,6 @@
   data-page-revision-created="{% if revision %}{{ revision.createdAt|datetz('U') }}{% endif %}"
   data-page-is-seen="{% if page and page.isSeenUser(user) %}1{% else %}0{% endif %}"
   data-linebreaks-enabled="{{ isEnabledLinebreaks() }}"
-  data-csrftoken="{{ csrf() }}"
   >
 
   <ul class="nav nav-tabs hidden-print">

+ 0 - 1
lib/views/page.html

@@ -59,7 +59,6 @@
   data-page-revision-created="{% if revision %}{{ revision.createdAt|datetz('U') }}{% endif %}"
   data-page-is-seen="{% if page and page.isSeenUser(user) %}1{% else %}0{% endif %}"
   data-linebreaks-enabled="{{ isEnabledLinebreaks() }}"
-  data-csrftoken="{{ csrf() }}"
   >
 
   {% if not page %}

+ 0 - 1
lib/views/page_list.html

@@ -82,7 +82,6 @@
   data-page-revision-created="{% if revision %}{{ revision.createdAt|datetz('U') }}{% endif %}"
   data-page-is-seen="{% if page and page.isSeenUser(user) %}1{% else %}0{% endif %}"
   data-linebreaks-enabled="{{ isEnabledLinebreaks() }}"
-  data-csrftoken="{{ csrf() }}"
   >
 
 <div class="portal {% if not page or req.query.offset > 0 %}hide{% endif %}">

+ 2 - 2
resource/js/app.js

@@ -39,8 +39,8 @@ if (mainContent !== null) {
 
 // FIXME
 const crowi = new Crowi({
-  me: $('#main-container').data('current-username'),
-  csrfToken: $('#main-container').data('csrftoken'),
+  me: $('body').data('current-username'),
+  csrfToken: $('body').data('csrftoken'),
 }, window);
 window.crowi = crowi;
 crowi.setConfig(JSON.parse(document.getElementById('crowi-context-hydrate').textContent || '{}'));