Merge pull request #12205 from aembler/misc-fixes-091024-2

Misc Fixes 09/10/24 2
concretecms · Sep 10, 2024 · ea54ded · ea54ded
2 parents be287b5 + 5ad0aab
commit ea54ded
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 14 deletions.
diff --git a/controllers/backend/group/chooser.php b/controllers/backend/group/chooser.php
@@ -6,6 +6,7 @@
 use Concrete\Core\Error\UserMessageException;
 use Concrete\Core\Http\ResponseFactoryInterface;
 use Concrete\Core\Tree\Type\Group;
+use Concrete\Core\Tree\Node\Type\Group as GroupNode;
 use Concrete\Core\User\Group\GroupList;
 
 class Chooser extends GroupController
@@ -20,7 +21,14 @@ public function getTree()
         $this->checkAccess(true);
         $tree = Group::get();
 
-        return $this->app->make(ResponseFactoryInterface::class)->json($tree);
+        $guestGroupNode = GroupNode::getTreeNodeByGroupID(GUEST_GROUP_ID);
+        $registeredGroupNode = GroupNode::getTreeNodeByGroupID(REGISTERED_GROUP_ID);
+
+        return $this->app->make(ResponseFactoryInterface::class)->json([
+            'tree' => $tree,
+            'guestGroupTreeNodeID' => $guestGroupNode->getTreeNodeID(),
+            'registeredGroupTreeNodeID' => $registeredGroupNode->getTreeNodeID(),
+        ]);
     }
 
     /**

diff --git a/controllers/backend/user_interface.php b/controllers/backend/user_interface.php
@@ -71,7 +71,7 @@ public function getViewObject()
     public function action()
     {
         $token = isset($this->validationToken) ? $this->validationToken : get_class($this);
-        $url = (string) call_user_func_array('parent::action', func_get_args());
+        $url = (string) call_user_func_array([parent::class, 'action'], func_get_args());
         $url .= (strpos($url, '?') === false ? '?' : '&') . $this->app->make('token')->getParameter($token);
 
         return $url;

diff --git a/controllers/backend/user_interface/block.php b/controllers/backend/user_interface/block.php
@@ -129,7 +129,7 @@ protected function getBlockToEdit()
 
     public function action()
     {
-        $url = call_user_func_array('parent::action', func_get_args());
+        $url = call_user_func_array([parent::class, 'action'], func_get_args());
         $url .= '&arHandle=' . urlencode($this->area->getAreaHandle());
         $url .= '&bID=' . $this->block->getBlockID();
 

diff --git a/controllers/backend/user_interface/file.php b/controllers/backend/user_interface/file.php
@@ -46,7 +46,7 @@ public function getViewObject()
 
     public function action()
     {
-        $url = call_user_func_array('parent::action', func_get_args());
+        $url = call_user_func_array([parent::class, 'action'], func_get_args());
         $url .= '&fID=' . $this->file->getFileID();
 
         return $url;

diff --git a/controllers/backend/user_interface/page.php b/controllers/backend/user_interface/page.php
@@ -55,7 +55,7 @@ public function action()
         } else {
             $cID = $this->page->getCollectionID();
         }
-        $url = call_user_func_array('parent::action', func_get_args());
+        $url = call_user_func_array([parent::class, 'action'], func_get_args());
         $url .= '&cID=' . $cID;
 
         return $url;

diff --git a/controllers/dialog/area/design.php b/controllers/dialog/area/design.php
@@ -111,7 +111,7 @@ public function submit()
 
     public function action()
     {
-        $url = call_user_func_array('parent::action', func_get_args());
+        $url = call_user_func_array([parent::class, 'action'], func_get_args());
         $url .= '&arHandle=' . h($this->area->getAreaHandle());
 
         return $url;

diff --git a/controllers/dialog/event/summary_templates.php b/controllers/dialog/event/summary_templates.php
@@ -52,7 +52,7 @@ protected function getOccurrenceFromRequest(): CalendarEventVersionOccurrence
     public function action()
     {
         $occurrence = $this->getOccurrenceFromRequest();
-        $url = call_user_func_array('parent::action', func_get_args());
+        $url = call_user_func_array([parent::class, 'action'], func_get_args());
         $url .= '&versionOccurrenceID=' . $occurrence->getID();
         return $url;
     }

diff --git a/controllers/dialog/tree/node.php b/controllers/dialog/tree/node.php
@@ -26,7 +26,7 @@ public function view()
 
     public function action()
     {
-        $url = call_user_func_array('parent::action', func_get_args());
+        $url = call_user_func_array([parent::class, 'action'], func_get_args());
         if (isset($this->node)) {
             $url .= '&treeNodeID=' . $this->node->getTreeNodeID();
         }

diff --git a/js/cms.js b/js/cms.js
diff --git a/js/features/navigation/frontend.js b/js/features/navigation/frontend.js
diff --git a/src/View/View.php b/src/View/View.php
@@ -297,7 +297,7 @@ public function renderViewContents($scopeItems)
         }
 
         // Render the template around it
-        if (file_exists($this->template)) {
+        if ($this->template != '' && file_exists($this->template)) {
             $contents = $this->renderTemplate($scopeItems, $contents);
         }
 

diff --git a/themes/atomik/main.js b/themes/atomik/main.js
diff --git a/themes/dashboard/main.js b/themes/dashboard/main.js