changed: updated for Elgg 5.1

ColdTrick · Nov 1, 2023 · 7c6a744 · 7c6a744
1 parent 74f1113
commit 7c6a744
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Poll
 ====
 
-![Elgg 5.0](https://img.shields.io/badge/Elgg-5.0-green.svg)
+![Elgg 5.1](https://img.shields.io/badge/Elgg-5.1-green.svg)
 ![Lint Checks](https://github.com/ColdTrick/poll/actions/workflows/lint.yml/badge.svg?event=push)
 [![Latest Stable Version](https://poser.pugx.org/coldtrick/poll/v/stable.svg)](https://packagist.org/packages/coldtrick/poll)
 [![License](https://poser.pugx.org/coldtrick/poll/license.svg)](https://packagist.org/packages/coldtrick/poll)

diff --git a/classes/ColdTrick/Poll/Cron.php b/classes/ColdTrick/Poll/Cron.php
@@ -15,9 +15,6 @@ class Cron {
 	 * @return void
 	 */
 	public static function sendCloseNotifications(\Elgg\Event $event): void {
-		echo 'Starting Poll closed notification' . PHP_EOL;
-		elgg_log('Starting Poll closed notification', 'NOTICE');
-
 		elgg_call(ELGG_IGNORE_ACCESS, function() {
 			$time = mktime(0, 0, 0);
 
@@ -57,8 +54,5 @@ public static function sendCloseNotifications(\Elgg\Event $event): void {
 				$poll->notifyParticipantsOnClose();
 			}
 		});
-
-		echo 'Done with Poll closed notification' . PHP_EOL;
-		elgg_log('Done with Poll closed notification', 'NOTICE');
 	}
 }
diff --git a/composer.json b/composer.json
@@ -11,10 +11,10 @@
 	},
 	"require": {
 		"composer/installers": "^1.0.8",
-		"npm-asset/chart.js": "~3.4.1"
+		"npm-asset/chart.js": "~4.4.0"
 	},
 	"conflict": {
-		"elgg/elgg": "<5.0"
+		"elgg/elgg": "<5.1"
 	},
 	"repositories": [
 		{

diff --git a/composer.lock b/composer.lock
diff --git a/views/default/poll/view/results.js b/views/default/poll/view/results.js
@@ -1,4 +1,4 @@
-define(['jquery', 'elgg', 'chart.js/chart.min'], function($, elgg, Chart) {
+define(['jquery', 'elgg', 'chart.js/chart.umd'], function($, elgg, Chart) {
 	function init_chart(elem) {
 		var data = $(elem).data();
 		if (data.initialized) {
@@ -48,7 +48,7 @@ define(['jquery', 'elgg', 'chart.js/chart.min'], function($, elgg, Chart) {
 		}
 
 		$(elem).data('initialized', true);
-	};
+	}
 
 	$('.poll-result-chart').each(function(index, elem) {
 		init_chart(elem);

diff --git a/views/default/resources/poll/view.php b/views/default/resources/poll/view.php
@@ -8,7 +8,7 @@
 $entity = get_entity($guid);
 
 // breadcrumb
-elgg_push_entity_breadcrumbs($entity, false);
+elgg_push_entity_breadcrumbs($entity);
 
 // build page elements
 $title = $entity->getDisplayName();