From a48e70228df21af88faee069b6c083f20187b00c Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 15 Sep 2015 11:58:26 +0200 Subject: [PATCH 1/3] Add pages permission to dataPermissions(), fixes #172 --- classes/controller.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/classes/controller.php b/classes/controller.php index 7e60ed2e..04d08be4 100644 --- a/classes/controller.php +++ b/classes/controller.php @@ -1319,6 +1319,9 @@ class AdminController case 'users': $permissions[] = ['admin.users']; break; + case 'pages': + $permissions[] = 'admin.pages'; + break; } return $permissions; From 632e3efa94b3dfdc78b39c0ca15bc696bf18793e Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 15 Sep 2015 12:02:18 +0200 Subject: [PATCH 2/3] Fix permissions being added as arrays in dataPermissions() --- classes/controller.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/controller.php b/classes/controller.php index 04d08be4..cb607264 100644 --- a/classes/controller.php +++ b/classes/controller.php @@ -1304,20 +1304,20 @@ class AdminController switch ($type) { case 'configuration': case 'system': - $permissions[] = ['admin.configuration']; + $permissions[] = 'admin.configuration'; break; case 'settings': case 'site': - $permissions[] = ['admin.settings']; + $permissions[] = 'admin.settings'; break; case 'plugins': - $permissions[] = ['admin.plugins']; + $permissions[] = 'admin.plugins'; break; case 'themes': - $permissions[] = ['admin.themes']; + $permissions[] = 'admin.themes'; break; case 'users': - $permissions[] = ['admin.users']; + $permissions[] = 'admin.users'; break; case 'pages': $permissions[] = 'admin.pages'; From c4c7f5b3f24f0e1c3b64224c611cf6b69f4691fb Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Tue, 15 Sep 2015 12:39:56 +0200 Subject: [PATCH 3/3] Add keepalive only on pages with data-grav-keepalive="true". Add data-grav-keepalive="true" to blueprints partials so all blueprints-generated forms are covered --- themes/grav/js/admin-all.js | 11 ++++++----- .../grav/templates/partials/blueprints-new.html.twig | 2 +- .../grav/templates/partials/blueprints-raw.html.twig | 2 +- themes/grav/templates/partials/blueprints.html.twig | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/themes/grav/js/admin-all.js b/themes/grav/js/admin-all.js index dd05e546..d06ce2e3 100644 --- a/themes/grav/js/admin-all.js +++ b/themes/grav/js/admin-all.js @@ -518,9 +518,10 @@ $(function () { remodal.find('.button.continue').attr('href', $(e.target).attr('href')); }); - // Keep-alive - setInterval(function() { - keepAlive(); - }, (GravAdmin.config.admin_timeout/2)*1000); //Call keepAlive() 60s before the admin session timeouts - + // Setup keep-alive on pages that have at least one element with data-grav-keepalive="true" set + if ($(document).find('[data-grav-keepalive="true"]').length > 0) { + setInterval(function() { + keepAlive(); + }, (GravAdmin.config.admin_timeout/2)*1000); //Call keepAlive() 60s before the admin session timeouts + } }); diff --git a/themes/grav/templates/partials/blueprints-new.html.twig b/themes/grav/templates/partials/blueprints-new.html.twig index 30cecfff..37e26611 100644 --- a/themes/grav/templates/partials/blueprints-new.html.twig +++ b/themes/grav/templates/partials/blueprints-new.html.twig @@ -1,6 +1,6 @@ {% set form_id = form_id ? form_id : 'blueprints' %} -
+ {% for field in blueprints.fields %} {% if field.type %} {% set value = data.value(field.name) %} diff --git a/themes/grav/templates/partials/blueprints-raw.html.twig b/themes/grav/templates/partials/blueprints-raw.html.twig index fd37acf6..88892915 100644 --- a/themes/grav/templates/partials/blueprints-raw.html.twig +++ b/themes/grav/templates/partials/blueprints-raw.html.twig @@ -1,6 +1,6 @@ {% set form_id = form_id ? form_id : 'blueprints' %} - + {% for field in blueprints.fields %} {% if field.type %} {% set value = data.value(field.name) %} diff --git a/themes/grav/templates/partials/blueprints.html.twig b/themes/grav/templates/partials/blueprints.html.twig index 16e7e9e3..0c96fa53 100644 --- a/themes/grav/templates/partials/blueprints.html.twig +++ b/themes/grav/templates/partials/blueprints.html.twig @@ -1,6 +1,6 @@ {% set form_id = form_id ? form_id : 'blueprints' %} - + {% for field in blueprints.fields %} {% if field.type %} {% set value = data.value(field.name) %}