Skip to content

Commit

Permalink
Merge pull request #2808 from Leantime/groupByMilestoneFix
Browse files Browse the repository at this point in the history 
Fixes issue where milestones without end dates are causing 500 error
  • Loading branch information
@marcelfolaron
marcelfolaron authored Nov 22, 2024
2 parents 0cd6647 + 9a9d3ff commit 7323d67
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .idea/leantime-oss.iml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/Domain/Tickets/Services/Tickets.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ public function getAllGrouped($searchCriteria): array
try {
$endDate = dtHelper()->parseDbDateTime($milestone->editTo)->formatDateForUser();
} catch (\Exception $e) {
$startDate = $this->language->__('text.no_date_defined');
$endDate = $this->language->__('text.no_date_defined');
}

$statusLabels = $this->getStatusLabels($milestone->projectId);
Expand Down
2 changes: 1 addition & 1 deletion app/Plugins
Submodule Plugins updated from 315673 to 6d91f5
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 16 additions & 3 deletions public/dist/mix-manifest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"/images/Screenshots/timesheet.png": "/images/Screenshots/timesheet.png",
"/images/apple-touch-icon.png": "/images/apple-touch-icon.png",
"/images/background-default.png": "/images/background-default.png",
"/images/background-leantime.png": "/images/background-leantime.png",
"/images/background-minimal.png": "/images/background-minimal.png",
"/images/backgrounds/bg0.png": "/images/backgrounds/bg0.png",
"/images/backgrounds/bg1.png": "/images/backgrounds/bg1.png",
Expand All @@ -52,7 +51,6 @@
"/images/icon-192.png": "/images/icon-192.png",
"/images/icon-512.png": "/images/icon-512.png",
"/images/index.html": "/images/index.html",
"/images/intentionsGraphics.png": "/images/intentionsGraphics.png",
"/images/loading-animation.svg": "/images/loading-animation.svg",
"/images/logo-powered-by-leantime.png": "/images/logo-powered-by-leantime.png",
"/images/logo.png": "/images/logo.png",
Expand Down Expand Up @@ -136,6 +134,13 @@
"/fonts/Atkinson-Hyperlegible-Italic-102a.woff2": "/fonts/Atkinson-Hyperlegible-Italic-102a.woff2",
"/fonts/Atkinson-Hyperlegible-Regular-102.ttf": "/fonts/Atkinson-Hyperlegible-Regular-102.ttf",
"/fonts/Atkinson-Hyperlegible-Regular-102a.woff2": "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2",
"/fonts/HankenGrotesk-Italic-VariableFont_wght.ttf": "/fonts/HankenGrotesk-Italic-VariableFont_wght.ttf",
"/fonts/HankenGrotesk-VariableFont_wght.ttf": "/fonts/HankenGrotesk-VariableFont_wght.ttf",
"/fonts/Hanken_Grotesk/HankenGrotesk-Italic-VariableFont_wght.ttf": "/fonts/Hanken_Grotesk/HankenGrotesk-Italic-VariableFont_wght.ttf",
"/fonts/Hanken_Grotesk/HankenGrotesk-VariableFont_wght.ttf": "/fonts/Hanken_Grotesk/HankenGrotesk-VariableFont_wght.ttf",
"/fonts/Hanken_Grotesk/OFL.txt": "/fonts/Hanken_Grotesk/OFL.txt",
"/fonts/Hanken_Grotesk/README.txt": "/fonts/Hanken_Grotesk/README.txt",
"/fonts/MaterialSymbolsRounded-VariableFont_FILL,GRAD,opsz,wght.ttf": "/fonts/MaterialSymbolsRounded-VariableFont_FILL,GRAD,opsz,wght.ttf",
"/fonts/Roboto-Bold.ttf": "/fonts/Roboto-Bold.ttf",
"/fonts/Roboto-Bold.woff2": "/fonts/Roboto-Bold.woff2",
"/fonts/Roboto-Italic.ttf": "/fonts/Roboto-Italic.ttf",
Expand Down Expand Up @@ -169,6 +174,7 @@
"/fonts/fa-solid-900.woff2": "/fonts/fa-solid-900.woff2",
"/fonts/fa-v4compatibility.ttf": "/fonts/fa-v4compatibility.ttf",
"/fonts/fa-v4compatibility.woff2": "/fonts/fa-v4compatibility.woff2",
"/fonts/material-icons/MaterialSymbolsRounded-VariableFont_FILL,GRAD,opsz,wght.ttf": "/fonts/material-icons/MaterialSymbolsRounded-VariableFont_FILL,GRAD,opsz,wght.ttf",
"/fonts/roboto/Google Android License.txt": "/fonts/roboto/Google Android License.txt",
"/fonts/roboto/LICENSE.txt": "/fonts/roboto/LICENSE.txt",
"/fonts/roboto/Roboto-Black.ttf": "/fonts/roboto/Roboto-Black.ttf",
Expand Down Expand Up @@ -199,6 +205,14 @@
"/fonts/shantell/Shantell_Sans-Informal_Bold_Italic.woff2": "/fonts/shantell/Shantell_Sans-Informal_Bold_Italic.woff2",
"/fonts/shantell/Shantell_Sans-Informal_Regular.woff2": "/fonts/shantell/Shantell_Sans-Informal_Regular.woff2",
"/fonts/shantell/Shantell_Sans-Informal_Regular_Italic.woff2": "/fonts/shantell/Shantell_Sans-Informal_Regular_Italic.woff2",
"/fonts/webfonts/fa-brands-400.ttf": "/fonts/webfonts/fa-brands-400.ttf",
"/fonts/webfonts/fa-brands-400.woff2": "/fonts/webfonts/fa-brands-400.woff2",
"/fonts/webfonts/fa-regular-400.ttf": "/fonts/webfonts/fa-regular-400.ttf",
"/fonts/webfonts/fa-regular-400.woff2": "/fonts/webfonts/fa-regular-400.woff2",
"/fonts/webfonts/fa-solid-900.ttf": "/fonts/webfonts/fa-solid-900.ttf",
"/fonts/webfonts/fa-solid-900.woff2": "/fonts/webfonts/fa-solid-900.woff2",
"/fonts/webfonts/fa-v4compatibility.ttf": "/fonts/webfonts/fa-v4compatibility.ttf",
"/fonts/webfonts/fa-v4compatibility.woff2": "/fonts/webfonts/fa-v4compatibility.woff2",
"/lottie/leo/Dino.json": "/lottie/leo/Dino.json",
"/lottie/leo/Loading_Clock_Animation.json": "/lottie/leo/Loading_Clock_Animation.json",
"/lottie/leo/Lochnes.json": "/lottie/leo/Lochnes.json",
Expand All @@ -207,7 +221,6 @@
"/lottie/leo/Peek_Unicorn.json": "/lottie/leo/Peek_Unicorn.json",
"/lottie/leo/Pirate.json": "/lottie/leo/Pirate.json",
"/lottie/leo/Rainbow_Unicorn.json": "/lottie/leo/Rainbow_Unicorn.json",
"/lottie/leo/Rolling LEO.json": "/lottie/leo/Rolling LEO.json",
"/lottie/leo/announcement.json": "/lottie/leo/announcement.json",
"/lottie/leo/celebration-robot.json": "/lottie/leo/celebration-robot.json",
"/lottie/leo/exclamation.json": "/lottie/leo/exclamation.json",
Expand Down

0 comments on commit 7323d67

Please sign in to comment.