removed(admin): control panel widget has been removed

Elgg · Oct 12, 2021 · 4e8d1cf · 4e8d1cf
1 parent 204fd65
commit 4e8d1cf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 20 deletions.
diff --git a/engine/classes/Elgg/Application/SystemEventHandlers.php b/engine/classes/Elgg/Application/SystemEventHandlers.php
@@ -67,7 +67,7 @@ public static function init() {
 		elgg_register_plugin_hook_handler('registeruser:validate:password', 'all', [_elgg_services()->passwordGenerator, 'registerUserPasswordValidation']);
 		elgg_register_plugin_hook_handler('view_vars', 'input/password', [_elgg_services()->passwordGenerator, 'addInputRequirements']);
 
-		$widgets = ['online_users', 'new_users', 'content_stats', 'banned_users', 'admin_welcome', 'control_panel', 'cron_status'];
+		$widgets = ['online_users', 'new_users', 'content_stats', 'banned_users', 'admin_welcome', 'cron_status'];
 		foreach ($widgets as $widget) {
 			elgg_register_widget_type(
 				$widget,

diff --git a/engine/classes/Elgg/Widgets/CreateAdminWidgetsHandler.php b/engine/classes/Elgg/Widgets/CreateAdminWidgetsHandler.php
@@ -27,8 +27,8 @@ public function __invoke(\Elgg\Event $event) {
 
 			// In the form column => array of handlers in order, top to bottom
 			$adminWidgets = [
-				1 => ['control_panel', 'admin_welcome'],
-				2 => ['online_users', 'new_users', 'content_stats'],
+				1 => ['admin_welcome', 'content_stats'],
+				2 => ['online_users', 'new_users'],
 			];
 
 			foreach ($adminWidgets as $column => $handlers) {

diff --git a/engine/tests/phpunit/unit/Elgg/Views/WidgetViewsRenderingTest.php b/engine/tests/phpunit/unit/Elgg/Views/WidgetViewsRenderingTest.php
@@ -34,26 +34,24 @@ public function getViewNames() {
 			'admin_welcome',
 			'banned_users',
 			'content_stats',
-			'control_panel',
 			'cron_status',
 			'new_users',
 			'online_users',
 		];
 
 		foreach ($widget_types as $widget_type) {
-			$views[] = "widgets/$widget_type/content";
-			$views[] = "widgets/$widget_type/edit";
+			$views[] = "widgets/{$widget_type}/content";
+			$views[] = "widgets/{$widget_type}/edit";
 		}
 
 		return $views;
 	}
 
 	public function getDefaultViewVars() {
-		$widget = $this->createObject([
-			'subtype' => 'widget',
-		]);
 		return [
-			'entity' => $widget,
+			'entity' => $this->createObject([
+				'subtype' => 'widget',
+			]),
 		];
 	}
 }
diff --git a/views/default/widgets/control_panel/content.php b/views/default/widgets/control_panel/content.php