From ec6129a7c6073ac1dcb8efa8e39199d802da5718 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 26 Jul 2016 17:34:52 +0200 Subject: [PATCH 1/2] Checks from JS --- js/admin.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/js/admin.js b/js/admin.js index 559e4209..29122e2c 100644 --- a/js/admin.js +++ b/js/admin.js @@ -59,14 +59,8 @@ $(document).ready(function() { - var availableChecks = new OCA.WorkflowEngine.AvailableChecksCollection(); - availableChecks.fetch(); - availableChecks.once('sync', function(){ - new OCA.FilesAccessControl.OperationsView({ - el: '#workflowengine .rules', - collection: new OCA.FilesAccessControl.OperationsCollection() - }); + new OCA.FilesAccessControl.OperationsView({ + el: '#workflowengine .rules', + collection: new OCA.FilesAccessControl.OperationsCollection() }); - OCA.WorkflowEngine.availableChecks = availableChecks; - }); From cfdd05f86570c45370ca66893bd9378f0893fae4 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 27 Jul 2016 12:30:25 +0200 Subject: [PATCH 2/2] Allow to reuse the template --- js/admin.js | 2 +- lib/Controller/AdminController.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/js/admin.js b/js/admin.js index 29122e2c..c938cad2 100644 --- a/js/admin.js +++ b/js/admin.js @@ -60,7 +60,7 @@ $(document).ready(function() { new OCA.FilesAccessControl.OperationsView({ - el: '#workflowengine .rules', + el: '#files_accesscontrol .rules', collection: new OCA.FilesAccessControl.OperationsCollection() }); }); diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php index 7cb8b58c..89c28122 100644 --- a/lib/Controller/AdminController.php +++ b/lib/Controller/AdminController.php @@ -58,7 +58,8 @@ public function index() { $this->eventDispatcher->dispatch('OCP\WorkflowEngine::loadAdditionalSettingScripts'); \OCP\Util::addScript($this->appName, 'admin'); return new TemplateResponse('workflowengine', 'admin', [ - 'heading' => $this->l10n->t('Files Access Control') + 'appid' => $this->appName, + 'heading' => $this->l10n->t('Files Access Control'), ], 'blank'); } }