From e8264d915f7932857a3128d481af9facec9bcec4 Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Wed, 18 Jan 2023 11:33:10 -0600 Subject: [PATCH] hotfix: updated to move pie chart label to be specified in the metacritic, added 'add' to pom resolver --- .../qqq/backend/core/model/dashboard/widgets/PieChartData.java | 3 +-- qqq-dev-tools/bin/resolve-pom-conflicts.sh | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/PieChartData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/PieChartData.java index 14369572..2298b7cc 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/PieChartData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/PieChartData.java @@ -43,9 +43,8 @@ public class PieChartData extends ChartData /******************************************************************************* ** *******************************************************************************/ - public PieChartData(String label, String description, String seriesLabel, List labels, List data) + public PieChartData(String description, String seriesLabel, List labels, List data) { - setLabel(label); setDescription(description); setChartData(new ChartData.Data() .withLabels(labels) diff --git a/qqq-dev-tools/bin/resolve-pom-conflicts.sh b/qqq-dev-tools/bin/resolve-pom-conflicts.sh index b9d922ca..bebd6414 100755 --- a/qqq-dev-tools/bin/resolve-pom-conflicts.sh +++ b/qqq-dev-tools/bin/resolve-pom-conflicts.sh @@ -5,3 +5,4 @@ ## Tries to automatically resove pom conflicts by putting SNAPSHOT back ############################################################################ gsed -i "/Updated upstream/,/=======/d;/Stashed/d" pom.xml +git add pom.xml