Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Milestone project selector fix #2483

Merged
merged 4 commits into from
Apr 23, 2024
Merged

Milestone project selector fix #2483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b44fce9
[fix] Milestone screen project selector showing all types.
marcelfolaron Apr 23, 2024
b2d22be
[fix] Select correct project based on session or current milestone id
marcelfolaron Apr 23, 2024
ba25f29
[Changelog CI] Add Changelog for Version 3.1.1
github-actions[bot] Apr 23, 2024
e6a184d
Merge branch 'master' into milestoneProjectSelectorFix
marcelfolaron Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .idea/leantime-oss.iml
View file
Open in desktop

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

2 changes: 0 additions & 2 deletions .idea/php.xml
View file
Open in desktop

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

1 change: 1 addition & 0 deletions .idea/vcs.xml
View file
Open in desktop

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

22 changes: 14 additions & 8 deletions app/Domain/Tickets/Templates/milestoneDialog.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading