pkp#9253 Hide site announcements behind feature flag

NateWr · Aug 25, 2023 · ec286b1 · ec286b1
1 parent 56d0197
commit ec286b1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/api/v1/announcements/PKPAnnouncementHandler.php b/api/v1/announcements/PKPAnnouncementHandler.php
@@ -22,6 +22,7 @@
 use APP\facades\Repo;
 use Exception;
 use Illuminate\Support\Facades\Bus;
+use PKP\config\Config;
 use PKP\context\Context;
 use PKP\db\DAORegistry;
 use PKP\facades\Locale;
@@ -94,6 +95,10 @@ public function __construct()
  */
  public function authorize($request, &$args, $roleAssignments)
  {
+ if (!Config::getVar('features', 'site_announcements') && !$request->getContext()) {
+ return false;
+ }
+
  if (!$request->getContext()) {
  $roleAssignments = $this->getSiteRoleAssignments($roleAssignments);
  }

diff --git a/pages/admin/AdminHandler.php b/pages/admin/AdminHandler.php
@@ -269,6 +269,13 @@ private function siteSettingsAvailability($request)
  'announcements',
  ];
 
+ if (!Config::getVar('features', 'site_announcements')) {
+ $tabs = array_filter(
+ $tabs,
+ function($tab) { return $tab !== 'announcements'; }
+ );
+ }
+
  $singleContextSite = (Services::get('context')->getCount() == 1);
 
  $tabsAvailability = [];

diff --git a/pages/announcement/AnnouncementHandler.php b/pages/announcement/AnnouncementHandler.php
@@ -21,6 +21,7 @@
 use APP\facades\Repo;
 use APP\handler\Handler;
 use APP\template\TemplateManager;
+use PKP\config\Config;
 use PKP\core\PKPRequest;
 use PKP\security\authorization\ContextRequiredPolicy;
 
@@ -100,6 +101,10 @@ protected function getContextId(Request $request): int
 
  protected function isAnnouncementsEnabled(Request $request): bool
  {
+ if (!Config::getVar('features', 'site_announcements') && !$request->getContext()) {
+ return false;
+ }
+
  $contextOrSite = $request->getContext() ?? $request->getSite();
  return $contextOrSite->getData('enableAnnouncements');
  }