From 6e0c9d86f37f05ca9d03c66d6de7f195dd08bc90 Mon Sep 17 00:00:00 2001 From: Joseph Snyder Date: Tue, 29 Aug 2023 14:25:46 -0400 Subject: [PATCH] Finish transition from CDASH_USER_CREATE_PROJECTS Finish the replacement of the query for CDASH_USER_CREATE_PROJECTS environment variable with the checking of the config singleton. All creation by users is controlled by the environment variable USER_CREATE_PROJECTS. Finishes work started in #1604 --- .env.example | 3 +++ app/Http/Controllers/UserController.php | 2 +- app/cdash/app/Model/Project.php | 2 +- app/cdash/config/config.php | 2 -- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.env.example b/.env.example index 99445adbaa..8cccf227e7 100755 --- a/.env.example +++ b/.env.example @@ -248,3 +248,6 @@ MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" # Whether or not to automatically register new users upon first login #SAML2_AUTO_REGISTER_NEW_USERS=false + +# Should normal user allowed to create projects +# USER_CREATE_PROJECTS = false \ No newline at end of file diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 259630a3f3..e5232d564c 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -59,7 +59,7 @@ public function userPageContent(): JsonResponse $response['user_is_admin'] = $user->admin; $response['show_monitor'] = config('queue.default') === 'database'; - if ($config->get('CDASH_USER_CREATE_PROJECTS')) { + if (boolval(config('cdash.user_create_projects'))) { $response['user_can_create_projects'] = 1; } else { $response['user_can_create_projects'] = 0; diff --git a/app/cdash/app/Model/Project.php b/app/cdash/app/Model/Project.php index 96ebd47bc7..fa314a2e33 100644 --- a/app/cdash/app/Model/Project.php +++ b/app/cdash/app/Model/Project.php @@ -1735,7 +1735,7 @@ public function ConvertToJSON(\App\Models\User $user): array } $response['name_encoded'] = urlencode($this->Name ?? ''); - $includeQuota = !$config->get('CDASH_USER_CREATE_PROJECTS') || $user->IsAdmin(); + $includeQuota = !boolval(config('cdash.user_create_projects')) || $user->IsAdmin(); if ($includeQuota) { $uploadQuotaGB = 0; diff --git a/app/cdash/config/config.php b/app/cdash/config/config.php index c9846ff021..66e8ed03cc 100644 --- a/app/cdash/config/config.php +++ b/app/cdash/config/config.php @@ -46,8 +46,6 @@ $CDASH_LOG_FILE = $CDASH_LOG_DIRECTORY . '/cdash.log'; // Upload directory (absolute or relative) $CDASH_UPLOAD_DIRECTORY = $CDASH_ROOT_DIR . '/public/upload'; -// Should normal user allowed to create projects -$CDASH_USER_CREATE_PROJECTS = false; // Request full email address to add new users // instead of displaying a list $CDASH_FULL_EMAIL_WHEN_ADDING_USER = '0';