From f0f5f02ef1ffde47ccfa3eb5e43aa1537e26e7e6 Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Tue, 16 Jun 2020 09:18:04 +0200
Subject: [PATCH] fix: [ACLComponent] Put `pushClusters` into the correct
 section. Also removed useless condition

---
 app/Controller/Component/ACLComponent.php | 2 +-
 app/Model/Server.php                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Controller/Component/ACLComponent.php b/app/Controller/Component/ACLComponent.php
index 6c21cacb7..a96ab110d 100644
--- a/app/Controller/Component/ACLComponent.php
+++ b/app/Controller/Component/ACLComponent.php
@@ -233,6 +233,7 @@ class ACLComponent extends Component
                 'forkTree' => array('*'),
                 'index' => array('*'),
                 'import' => array('perm_galaxy_editor'),
+                'pushCluster' => array('perm_sync'),
                 'relationsGraph' => array('*'),
                 'selectGalaxy' => array('perm_tagger'),
                 'selectGalaxyNamespace' => array('perm_tagger'),
@@ -249,7 +250,6 @@ class ACLComponent extends Component
                 'detach' => array('perm_tagger'),
                 'edit' => array('perm_galaxy_editor'),
                 'index' => array('*'),
-                'pushCluster' => array('perm_sync'),
                 'restSearch' => array('*'),
                 'updateCluster' => array('perm_galaxy_editor'),
                 'view' => array('*'),
diff --git a/app/Model/Server.php b/app/Model/Server.php
index 7c59cf7db..e040a2c12 100644
--- a/app/Model/Server.php
+++ b/app/Model/Server.php
@@ -3056,7 +3056,7 @@ class Server extends AppModel
                         if ('Success' === $result) {
                             $successes[] = $event['Event']['id'];
 
-                            if ($push['canPush'] || $push['canEditGalaxyCluster']) {
+                            if ($push['canEditGalaxyCluster']) {
                                 $clustersSuccesses = $this->syncGalaxyClusters($HttpSocket, $this->data, $user, $event);
                             } else {
                                 $clustersSuccesses = array();