1882: move moreinfo into span

Leantime · Aug 12, 2024 · 961b829 · 961b829
1 parent 5c82d32
commit 961b829
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/Domain/Tickets/Services/Tickets.php b/app/Domain/Tickets/Services/Tickets.php
@@ -507,6 +507,7 @@ public function getAllGrouped($searchCriteria): array
 
             foreach ($tickets as $ticket) {
                 $class = '';
+                $moreInfo = '';
 
                 if (isset($ticket[$searchCriteria['groupBy']])) {
                     $groupedFieldValue = strtolower($ticket[$searchCriteria['groupBy']]);
@@ -550,7 +551,8 @@ public function getAllGrouped($searchCriteria): array
                                     $statusLabels = $this->getStatusLabels($milestone->projectId);
                                     $status = $statusLabels[$milestone->status]['name'];
                                     $class = '" style="color:' . $color . '"';
-                                    $label = $ticket["milestoneHeadline"] .  ", " . $this->language->__("label.start") . ": " . $startDate . ", " . $this->language->__("label.end") . ": " . $endDate . ", " . $this->language->__("label.status_lowercase") . ": " . $status . " <a href='#/tickets/editMilestone/" . $ticket["milestoneid"] . "' style='float:right;'><i class='fa fa-edit'></i></a><a>";
+                                    $moreInfo = $this->language->__("label.start") . ": " . $startDate . ", " . $this->language->__("label.end") . ": " . $endDate . ", " . $this->language->__("label.status_lowercase") . ": " . $status;
+                                    $label = $ticket["milestoneHeadline"] .  " <a href='#/tickets/editMilestone/" . $ticket["milestoneid"] . "' style='float:right;'><i class='fa fa-edit'></i></a><a>";
                                 }
 
                                 break;
@@ -579,6 +581,7 @@ public function getAllGrouped($searchCriteria): array
 
                         $ticketGroups[$groupedFieldValue] = array(
                             "label" => $label,
+                            "more-info" => $moreInfo,
                             "id" => strtolower($groupedFieldValue),
                             "class" => $class,
                             'items' => [$ticket],

diff --git a/app/Domain/Tickets/Templates/showAll.tpl.php b/app/Domain/Tickets/Templates/showAll.tpl.php
@@ -80,9 +80,10 @@
             <?php if ($group['label'] != 'all') { ?>
                 <h5 class="accordionTitle <?=$group['class']?>" id="accordion_link_<?=$group['id'] ?>">
                     <a href="javascript:void(0)" class="accordion-toggle" id="accordion_toggle_<?=$group['id'] ?>" onclick="leantime.snippets.accordionToggle('<?=$group['id'] ?>');">
-                        <i class="fa fa-angle-down"></i><?=$group['label'] ?> (<?=count($group['items']) ?>)
+                        <i class="fa fa-angle-down"></i><?=$group['label'] ?>(<?=count($group['items']) ?>)
                     </a>
                 </h5>
+                <span><?=$group['more-info'] ?></span>
                 <div class="simpleAccordionContainer" id="accordion_content-<?=$group['id'] ?>">
             <?php } ?>