Merge pull request #86 from jonasraoni/feature-main-8333-add-remainin…

…g-fks Feature main 8333 add remaining fks
pkp · Jul 24, 2024 · 9d92d83 · 9d92d83
2 parents 07a2037 + 555a188
commit 9d92d83
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/CustomBlockManagerPlugin.php b/CustomBlockManagerPlugin.php
@@ -66,7 +66,7 @@ public function register($category, $path, $mainContextId = null)
                         $contextId = $mainContextId;
                     } else {
                         $context = $request->getContext();
-                        $contextId = $context?->getId() ?? \PKP\core\PKPApplication::CONTEXT_SITE;
+                        $contextId = $context?->getId() ?? \PKP\core\PKPApplication::SITE_CONTEXT_ID;
                     }
 
                     // Load the custom blocks we have created

diff --git a/CustomBlockPlugin.php b/CustomBlockPlugin.php
@@ -123,7 +123,7 @@ public function getDescription()
     public function getContents($templateMgr, $request = null)
     {
         $context = $request->getContext();
-        $contextId = $context ? $context->getId() : 0;
+        $contextId = $context ? $context->getId() : Application::SITE_CONTEXT_ID;
 
         // Get the block contents.
         $customBlockTitle = $this->getSetting($contextId, 'blockTitle');

diff --git a/controllers/grid/CustomBlockGridHandler.php b/controllers/grid/CustomBlockGridHandler.php
@@ -16,6 +16,7 @@
 
 namespace APP\plugins\generic\customBlockManager\controllers\grid;
 
+use APP\core\Application;
 use APP\plugins\generic\customBlockManager\controllers\grid\form\CustomBlockForm;
 use APP\plugins\generic\customBlockManager\CustomBlockManagerPlugin;
 use APP\plugins\generic\customBlockManager\CustomBlockPlugin;
@@ -77,7 +78,7 @@ public function initialize($request, $args = null)
     {
         parent::initialize($request, $args);
         $context = $request->getContext();
-        $contextId = $context ? $context->getId() : 0;
+        $contextId = $context ? $context->getId() : Application::SITE_CONTEXT_ID;
 
         // Set the grid title.
         $this->setTitle('plugins.generic.customBlockManager.customBlocks');
@@ -162,7 +163,7 @@ public function editCustomBlock($args, $request)
     {
         $blockName = $request->getUserVar('blockName');
         $context = $request->getContext();
-        $contextId = $context ? $context->getId() : 0;
+        $contextId = $context ? $context->getId() : Application::SITE_CONTEXT_ID;
         $this->setupTemplate($request);
 
         $customBlockPlugin = null;
@@ -192,7 +193,7 @@ public function updateCustomBlock($args, $request)
     {
         $pluginName = $request->getUserVar('existingBlockName');
         $context = $request->getContext();
-        $contextId = $context ? $context->getId() : 0;
+        $contextId = $context ? $context->getId() : Application::SITE_CONTEXT_ID;
         $this->setupTemplate($request);
 
         $customBlockPlugin = null;
@@ -232,7 +233,7 @@ public function deleteCustomBlock($args, $request)
 
         $blockName = $request->getUserVar('blockName');
         $context = $request->getContext();
-        $contextId = $context ? $context->getId() : 0;
+        $contextId = $context ? $context->getId() : Application::SITE_CONTEXT_ID;
 
         // Delete all the entries for this block plugin
         /** @var PluginSettingsDAO */

diff --git a/controllers/grid/form/CustomBlockForm.php b/controllers/grid/form/CustomBlockForm.php
@@ -26,7 +26,7 @@
 
 class CustomBlockForm extends Form
 {
-    /** @var int Context (press / journal) ID */
+    /** @var ?int Context (press / journal) ID */
     public $contextId;
 
     /** @var CustomBlockPlugin Custom block plugin */
@@ -36,7 +36,7 @@ class CustomBlockForm extends Form
      * Constructor
      *
      * @param string $template the path to the form template file
-     * @param int $contextId
+     * @param ?int $contextId
      * @param CustomBlockPlugin $plugin
      */
     public function __construct($template, $contextId, $plugin = null)