Merge pull request #2483 from Leantime/milestoneProjectSelectorFix

Milestone project selector fix
Leantime · Apr 23, 2024 · 7307801 · 7307801
2 parents b43eacb + e6a184d
commit 7307801
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/Domain/Tickets/Templates/milestoneDialog.tpl.php b/app/Domain/Tickets/Templates/milestoneDialog.tpl.php
@@ -17,7 +17,7 @@
 </script>
 
 <div class="modal-icons">
- <?php if( isset($currentMilestone->id) && $currentMilestone->id != '') {?>
+ <?php if (isset($currentMilestone->id) && $currentMilestone->id != '') {?>
  <a href="#/tickets/delMilestone/<?php echo $currentMilestone->id; ?>" class="danger" data-tippy-content="Delete"><i class='fa fa-trash-can'></i></a>
  <?php } ?>
 </div>
@@ -33,17 +33,23 @@
 
  <label class="control-label"><?=$tpl->__('label.project') ?></label>
  <select name="projectId" class="tw-w-full">
- <?php foreach($allAssignedprojects as $project) { ?>
+ <?php foreach ($allAssignedprojects as $project) {
+ if (empty($project['type']) || $project['type'] == "project") {
+ ?>
  <option value="<?=$project['id'] ?>"
  <?php
- if($currentMilestone->projectId == $project['id']) {
- echo "selected";
- }else if( $_SESSION['currentProject'] == $project['id']){
- echo "selected";
- }
+ if (
+ !empty($currentMilestone->projectId)
+ && $currentMilestone->projectId == $project['id']
+ ) {
+ echo "selected";
+ } else if ($_SESSION['currentProject'] == $project['id']) {
+ echo "selected";
+ }
  ?>
  ><?=$tpl->escape($project["name"]); ?></option>
- <?php } ?>
+ <?php }
+ } ?>
  </select>
 
  <label><?php echo $tpl->__('label.todo_status'); ?></label>