From 699c0bfa1decdf1cc6380ceb0c73c9c7108dfa00 Mon Sep 17 00:00:00 2001 From: isUnknown Date: Fri, 22 Nov 2024 07:27:11 +0100 Subject: [PATCH] fix user authorized projects custom methods --- public/site/blueprints/pages/projects.yml | 26 ++++++------------- .../site/blueprints/users/project-manager.yml | 1 + public/site/plugins/user-projects/index.php | 20 ++++++++++++++ public/site/plugins/your-projects/index.php | 5 ---- 4 files changed, 29 insertions(+), 23 deletions(-) create mode 100644 public/site/plugins/user-projects/index.php delete mode 100644 public/site/plugins/your-projects/index.php diff --git a/public/site/blueprints/pages/projects.yml b/public/site/blueprints/pages/projects.yml index 1d0435d..d8ccdc8 100644 --- a/public/site/blueprints/pages/projects.yml +++ b/public/site/blueprints/pages/projects.yml @@ -10,30 +10,20 @@ tabs: extends: sections/projects headline: Brouillons status: draft - - width: 1/2 - sections: - unlisted: - extends: sections/projects - headline: Archivés - status: unlisted - width: 1/2 sections: listed: extends: sections/projects headline: En cours - status: listed + query: user.currentProjects + sortBy: modified desc + - width: 1/2 + sections: + unlisted: + extends: sections/projects + headline: Archivés + query: user.archivedProjects sortBy: modified desc - # - width: 1/1 - # sections: - # yourProjects: - # label: Tous vos projets - # type: pages - # query: user.projects - # sortBy: modified desc - # create: false - # search: true - # image: - # query: page.client.toPage.logo.toFile settings: label: Réglages diff --git a/public/site/blueprints/users/project-manager.yml b/public/site/blueprints/users/project-manager.yml index 53ba73e..d4b1fff 100644 --- a/public/site/blueprints/users/project-manager.yml +++ b/public/site/blueprints/users/project-manager.yml @@ -1,6 +1,7 @@ title: fr: Chef·fe de projet en: Project Manager +home: /panel/pages/projects permissions: access: users: false diff --git a/public/site/plugins/user-projects/index.php b/public/site/plugins/user-projects/index.php new file mode 100644 index 0000000..15c5aad --- /dev/null +++ b/public/site/plugins/user-projects/index.php @@ -0,0 +1,20 @@ + [ + 'currentProjects' => function() { + if ($this->role() == 'admin') { + return page('projects')->children()->listed(); + } else { + return $this->projects()->toPages()->listed(); + } + }, + 'archivedProjects' => function() { + if ($this->role() == 'admin') { + return page('projects')->children()->unlisted(); + } else { + return $this->projects()->toPages()->unlisted(); + } + }, + ] +]); diff --git a/public/site/plugins/your-projects/index.php b/public/site/plugins/your-projects/index.php deleted file mode 100644 index e2bad00..0000000 --- a/public/site/plugins/your-projects/index.php +++ /dev/null @@ -1,5 +0,0 @@ - [] -]);