Ensure current project is selected for new sprints

Leantime · Nov 18, 2024 · cbc8aff · cbc8aff
1 parent 6da255a
commit cbc8aff
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 10 deletions.
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/app/Domain/Sprints/Templates/sprintdialog.tpl.php b/app/Domain/Sprints/Templates/sprintdialog.tpl.php
@@ -20,19 +20,19 @@
     <label><?= $tpl->__('label.sprint_name') ?></label>
     <input type="text" name="name" value="<?php echo $currentSprint->name?>" placeholder="<?= $tpl->__('label.sprint_name') ?>"/><br />
 
+    <?php
+
+    function isSelected($projectId, $currentSprint, $currentProject) {
+        return (isset($currentSprint) && ($currentSprint->projectId == $projectId || $currentProject == $projectId)) ||
+            (!isset($currentSprint) && $currentProject == $projectId);
+    }
+
+    $currentProject = session('currentProject');
+    ?>
     <label><?= $tpl->__('label.project') ?></label>
     <select name="projectId">
         <?php foreach ($allAssignedprojects as $project) { ?>
-            <option value="<?= $project['id'] ?>"
-                    <?php
-                    if (isset($currentSprint)) {
-                        if ($currentSprint->projectId == $project['id']) {
-                            echo 'selected';
-                        }
-                    } elseif (session('currentProject') == $project['id']) {
-                        echo 'selected';
-                    }
-            ?>
+            <option value="<?= $project['id'] ?>" <?= isSelected($project['id'], $currentSprint ?? null, $currentProject) ? 'selected' : '' ?>
         ><?= $tpl->escape($project['name']); ?></option>
         <?php } ?>
     </select><br />