Skip to content

Commit

Permalink
fix: also make open project transition work again #3779
Browse files Browse the repository at this point in the history
  • Loading branch information
johannesjo committed Jan 3, 2025
1 parent c45c0c7 commit c4185a4
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,57 @@ <h1 mat-dialog-title>
class="dialog-header-icon"
svgIcon="open_project"
></mat-icon>
<span>{{T.F.OPEN_PROJECT.DIALOG_TRANSITION.TITLE|translate}}</span>
<span>{{ T.F.OPEN_PROJECT.DIALOG_TRANSITION.TITLE|translate }}</span>
</h1>

<mat-dialog-content>
<table>
<tr>
<th>{{T.F.OPEN_PROJECT.DIALOG_TRANSITION.TASK_NAME|translate}}</th>
<td>{{data.task ? data.task?.title : '–'}}</td>
<th>{{ T.F.OPEN_PROJECT.DIALOG_TRANSITION.TASK_NAME|translate }}</th>
<td>{{ data.task ? data.task?.title : '–' }}</td>
</tr>
<tr>
<th>{{T.F.OPEN_PROJECT.DIALOG_TRANSITION.CURRENT_STATUS|translate}}</th>
<th>{{ T.F.OPEN_PROJECT.DIALOG_TRANSITION.CURRENT_STATUS|translate }}</th>
<td>
{{data.issue?._embedded?.status?.name ? data.issue?._embedded?.status?.name :
'–'}}
{{ data.issue?._embedded?.status?.name ? data.issue?._embedded?.status?.name : '–'
}}
</td>
</tr>
<tr>
<th>{{T.F.OPEN_PROJECT.DIALOG_TRANSITION.CURRENT_ASSIGNEE|translate}}</th>
<th>{{ T.F.OPEN_PROJECT.DIALOG_TRANSITION.CURRENT_ASSIGNEE|translate }}</th>
<td>
{{data.issue?._embedded?.assignee?.name ? data.issue?._embedded?.assignee?.name :
'–'}}
{{ data.issue?._embedded?.assignee?.name ? data.issue?._embedded?.assignee?.name :
'–' }}
</td>
</tr>
<tr>
<th>{{T.F.OPEN_PROJECT.DIALOG_TRANSITION.PERCENTAGE_DONE|translate}}</th>
<th>{{ T.F.OPEN_PROJECT.DIALOG_TRANSITION.PERCENTAGE_DONE|translate }}</th>
<td>
<!-- TODO: The 'tickInterval' property no longer exists -->
<mat-slider
thumbLabel
[(ngModel)]="percentageDone"
[displayWith]="displayThumbWith"
step="5"
min="0"
max="100"
aria-label="units"
><input matSliderThumb
><input
matSliderThumb
[(ngModel)]="percentageDone"
/></mat-slider>
</td>
</tr>
</table>
<mat-form-field>
<label>{{T.F.OPEN_PROJECT.DIALOG_TRANSITION.CHOOSE_STATUS|translate}}</label>
<label>{{ T.F.OPEN_PROJECT.DIALOG_TRANSITION.CHOOSE_STATUS|translate }}</label>
<mat-select [(ngModel)]="chosenTransition">
<!--<mat-option value="DO_NOT">Don't transition</mat-option>-->
<!--<mat-option value="ALWAYS_ASK">Always open dialog</mat-option>-->
@for (transition of (availableTransitions$|async); track trackByIndex($index,
transition)) {
<mat-option [value]="transition">
<!--<img [src]="transition.to.iconUrl">-->
{{transition.name}}
{{ transition.name }}
</mat-option>
}
</mat-select>
Expand All @@ -68,15 +69,15 @@ <h1 mat-dialog-title>
mat-button
type="button"
>
{{T.G.CANCEL|translate}}
{{ T.G.CANCEL|translate }}
</button>
<button
(click)="transitionIssue()"
class="btn btn-primary submit-button"
color="primary"
mat-stroked-button
>
{{T.F.OPEN_PROJECT.DIALOG_TRANSITION.TITLE|translate}}
{{ T.F.OPEN_PROJECT.DIALOG_TRANSITION.TITLE|translate }}
</button>
</div>
</mat-dialog-actions>
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { IssueProviderService } from 'src/app/features/issue/issue-provider.serv
import { assertTruthy } from '../../../../../../util/assert-truthy';
import { FormsModule } from '@angular/forms';
import { AsyncPipe } from '@angular/common';
import { MatSlider, MatSliderThumb } from '@angular/material/slider';
import { MatSliderModule } from '@angular/material/slider';
import { TaskService } from '../../../../../tasks/task.service';
import { MatIcon } from '@angular/material/icon';
import { TranslatePipe } from '@ngx-translate/core';
Expand All @@ -39,12 +39,11 @@ import { MatButton } from '@angular/material/button';
imports: [
FormsModule,
AsyncPipe,
MatSlider,
MatDialogTitle,
MatIcon,
TranslatePipe,
MatDialogContent,
MatSliderThumb,
MatSliderModule,
MatFormField,
MatSelect,
MatOption,
Expand Down

0 comments on commit c4185a4

Please sign in to comment.