From 2b3cd11142a42b49b180637a73b9c4baaf09f775 Mon Sep 17 00:00:00 2001 From: Jeroen Pinoy Date: Mon, 22 Apr 2024 00:03:58 +0200 Subject: [PATCH] fix: [galaxy_clusters] Add orgc filter option for index, set it as default for galaxy view 'My Clusters' --- app/Controller/GalaxyClustersController.php | 2 ++ app/View/GalaxyClusters/ajax/index.ctp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Controller/GalaxyClustersController.php b/app/Controller/GalaxyClustersController.php index bc18807e0..20846b5b8 100644 --- a/app/Controller/GalaxyClustersController.php +++ b/app/Controller/GalaxyClustersController.php @@ -59,6 +59,8 @@ class GalaxyClustersController extends AppController $contextConditions['GalaxyCluster.default'] = true; } elseif ($filters['context'] == 'custom') { $contextConditions['GalaxyCluster.default'] = false; + } elseif ($filters['context'] == 'orgc') { + $contextConditions['GalaxyCluster.orgc_id'] = $this->Auth->user('org_id'); } elseif ($filters['context'] == 'org') { $contextConditions['GalaxyCluster.org_id'] = $this->Auth->user('org_id'); } elseif ($filters['context'] == 'deleted') { diff --git a/app/View/GalaxyClusters/ajax/index.ctp b/app/View/GalaxyClusters/ajax/index.ctp index 3806dae09..99dc76fe3 100644 --- a/app/View/GalaxyClusters/ajax/index.ctp +++ b/app/View/GalaxyClusters/ajax/index.ctp @@ -34,7 +34,7 @@ ), array( 'active' => $context === 'org', - 'url' => sprintf('%s/galaxies/view/%s/context:org', $baseurl, $galaxy_id), + 'url' => sprintf('%s/galaxies/view/%s/context:orgc', $baseurl, $galaxy_id), 'text' => __('My Clusters'), ), array(