Fixed hardcoded separators for backup and media picker (fixes #1602 , f…

…ixes #1502)
getgrav · Feb 5, 2019 · bfb0b8e · bfb0b8e
1 parent b8b8835
commit bfb0b8e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/themes/grav/app/dashboard/backup.js b/themes/grav/app/dashboard/backup.js
@@ -3,7 +3,7 @@ import { translations } from 'grav-config';
 import request from '../utils/request';
 import { Instances as Charts } from './chart';
 
-$('[data-ajax*="task:backup/"]').on('click', function() {
+$('[data-backup][data-ajax*="backup/"]').on('click', function() {
     let element = $(this);
     let url = element.data('ajax');
     const inDropdown = element.closest('.dropdown-menu');
@@ -26,7 +26,7 @@ $('[data-ajax*="task:backup/"]').on('click', function() {
     });
 });
 
-$('[data-ajax*="task:backupDelete"]').on('click', function() {
+$('[data-backup][data-ajax*="backupDelete"]').on('click', function() {
     let element = $(this);
     let url = element.data('ajax');
     const tr = element.closest('tr');

diff --git a/themes/grav/app/media/index.js b/themes/grav/app/media/index.js
@@ -61,24 +61,24 @@ if ($('.thumbs-list-container .dropzone')[0]) {
         $('.dropzone')[0].dropzone.files.forEach(function(file) { file.previewElement.remove(); });
         $('.dropzone').first().removeClass('dz-started');
 
-        request(config.base_url_relative + '/media-manager.json/task:clearMediaCache', { method: 'post', body }, () => {
+        request(`${config.base_url_relative}/media-manager.json/task${config.param_sep}clearMediaCache`, { method: 'post', body }, () => {
             filterFiles();
         });
     });
 }
 
 /* handle loading media */
 var loadMedia = function loadMedia(filters, callback) {
-    var url = config.base_url_relative + '/media.json/tmpl:media-list-content/index:' + global_index;
+    var url = `${config.base_url_relative}/media.json/tmpl${config.param_sep}media-list-content/index${config.param_sep}${global_index}`;
 
     if (filters.page) {
-        url += '/page:' + (filters.page).split('/').join('%5C');
+        url += `/page${config.param_sep}${(filters.page).split('/').join('%5C')}`;
     }
     if (filters.type && filters.type !== '*') {
-        url += '/type:' + filters.type;
+        url += `/type${config.param_sep}${filters.type}`;
     }
     if (filters.date && filters.date !== '*') {
-        url += '/date:' + filters.date;
+        url += `/date${config.param_sep}${filters.date}`;
     }
 
     if (!isLoading) {

diff --git a/themes/grav/js/admin.min.js b/themes/grav/js/admin.min.js
diff --git a/themes/grav/js/vendor.min.js b/themes/grav/js/vendor.min.js
diff --git a/themes/grav/templates/forms/fields/backupshistory/backupshistory.html.twig b/themes/grav/templates/forms/fields/backupshistory/backupshistory.html.twig
@@ -26,7 +26,7 @@
                 <td class="right pad">{{ backup.size|nicefilesize }}</td>
                 <td class="right pad nowrap" >
                     <a class="button button-small hint--bottom" href="{{ grav.backups.getBackupDownloadUrl(backup.path, admin.base) }}" data-hint="Download"><i class="fa fa-download"></i></a>
-                    <span class="button button-small danger hint--bottom" data-hint="Delete" data-ajax="{{ backup_delete }}"><i class="fa fa-close"></i></span>
+                    <span class="button button-small danger hint--bottom" data-hint="Delete" data-backup data-ajax="{{ backup_delete }}"><i class="fa fa-close"></i></span>
                 </td>
             </tr>
         {% endfor %}

diff --git a/themes/grav/templates/partials/backups-button.html.twig b/themes/grav/templates/partials/backups-button.html.twig
@@ -2,7 +2,7 @@
     {% set profiles = grav.backups.getBackupProfiles() %}
     {% set backup_url = uri.addNonce(base_url_relative ~ "/backup.json/id" ~ config.system.param_sep ~ "%BACKUP_ID/task" ~ config.system.param_sep ~ "backup", 'admin-form', 'admin-nonce') %}
 
-    <button class="button" data-ajax="{{ backup_url|replace({'%BACKUP_ID':'0'}) }}">
+    <button class="button" data-backup data-ajax="{{ backup_url|replace({'%BACKUP_ID':'0'}) }}">
         <i class="fa fa-life-ring"></i> {{ "PLUGIN_ADMIN.BACKUP_NOW"|tu }}
     </button>
     <button type="button" class="button dropdown-toggle" data-toggle="dropdown">
@@ -11,7 +11,7 @@
     <ul class="dropdown-menu">
         {% for id, profile in profiles %}
             <li>
-                <a data-ajax="{{ backup_url|replace({'%BACKUP_ID':id}) }}" class="button">{{ profile.name }}</a>
+                <a data-backup data-ajax="{{ backup_url|replace({'%BACKUP_ID':id}) }}" class="button">{{ profile.name }}</a>
             </li>
         {% endfor %}
         <li>