From 117845a56ea1a0c595bc62012a6d819363c0baf4 Mon Sep 17 00:00:00 2001
From: Jeroen Dalsem <jdalsem@coldtrick.com>
Date: Thu, 1 Aug 2024 10:23:45 +0200
Subject: [PATCH] chore: moved the full view contents to the object view

---
 views/default/object/widget_page.php          | 51 +++++++++++++++++--
 .../resources/widget_manager/widget_page.php  | 46 +----------------
 2 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/views/default/object/widget_page.php b/views/default/object/widget_page.php
index 11939dd..2c4033b 100644
--- a/views/default/object/widget_page.php
+++ b/views/default/object/widget_page.php
@@ -4,11 +4,52 @@
 	return;
 }
 
-$vars['icon'] = false;
-$vars['byline'] = false;
+if (!elgg_extract('full_view', $vars)) {
+	$vars['icon'] = false;
+	$vars['byline'] = false;
+	
+	$title = $entity->getDisplayName() . " [{$entity->url}]";
+	
+	$vars['title'] = elgg_view_url($entity->getURL(), elgg_get_excerpt($title, 100));
+	
+	echo elgg_view('object/elements/summary', $vars);
+	return;
+}
+
+elgg_push_context('index');
+elgg_set_page_owner_guid($entity->guid);
+
+$num_columns = $entity->getNumColumns();
+$layout = $entity->layout;
 
-$title = $entity->getDisplayName() . " [{$entity->url}]";
+$classes = [];
+$column_classes = [];
 
-$vars['title'] = elgg_view_url($entity->getURL(), elgg_get_excerpt($title, 100));
+switch ($layout) {
+	case '33|33|33':
+		$classes[] = 'widgets-3-columns';
+		break;
+	case '50|50':
+		$classes[] = 'widgets-2-columns';
+		break;
+	default:
+		$classes[] = "widgets-{$num_columns}-columns";
+		
+		$columns = array_reverse(explode('|', $layout));
+		foreach ($columns as $column_index => $column_width) {
+			$column_classes[$column_index + 1] = "col-width-{$column_width}";
+		}
+		break;
+}
+
+if ($entity->show_description !== false && !empty($entity->description)) {
+	echo elgg_view('output/longtext', ['value' => $entity->description, 'class' => 'widget-page-description']);
+}
 
-echo elgg_view('object/elements/summary', $vars);
+echo elgg_view_layout('widgets', [
+	'class' => $classes,
+	'num_columns' => $num_columns,
+	'column_classes' => $column_classes,
+	'exact_match' => true,
+	'show_add_widgets' => false,
+]);
diff --git a/views/default/resources/widget_manager/widget_page.php b/views/default/resources/widget_manager/widget_page.php
index 5b414a7..e3b5d7a 100644
--- a/views/default/resources/widget_manager/widget_page.php
+++ b/views/default/resources/widget_manager/widget_page.php
@@ -17,32 +17,6 @@
 
 $widget_page = $pages[0];
 
-elgg_push_context('index');
-elgg_set_page_owner_guid($widget_page->guid);
-
-$num_columns = $widget_page->getNumColumns();
-$layout = $widget_page->layout;
-
-$classes = [];
-$column_classes = [];
-
-switch ($layout) {
-	case '33|33|33':
-		$classes[] = 'widgets-3-columns';
-		break;
-	case '50|50':
-		$classes[] = 'widgets-2-columns';
-		break;
-	default:
-		$classes[] = "widgets-{$num_columns}-columns";
-		
-		$columns = array_reverse(explode('|', $layout));
-		foreach ($columns as $column_index => $column_width) {
-			$column_classes[$column_index + 1] = "col-width-{$column_width}";
-		}
-		break;
-}
-
 if ($widget_page->canEdit()) {
 	$href = elgg_generate_url('widgets:add_panel', [
 		'context' => elgg_get_context(),
@@ -84,24 +58,8 @@
 	]);
 }
 
-$title = $widget_page->title ?: false;
-
-$content = '';
-
-if ($widget_page->show_description !== false && !empty($widget_page->description)) {
-	$content .= elgg_view('output/longtext', ['value' => $widget_page->description, 'class' => 'widget-page-description']);
-}
-
-$content .= elgg_view_layout('widgets', [
-	'class' => $classes,
-	'num_columns' => $num_columns,
-	'column_classes' => $column_classes,
-	'exact_match' => true,
-	'show_add_widgets' => false,
-]);
-
 echo elgg_view_page($widget_page->getDisplayName(), [
-	'title' => $title,
-	'content' => $content,
+	'title' => $widget_page->title ?: false,
+	'content' => elgg_view_entity($widget_page),
 	'entity' => $widget_page,
 ]);