Skip to content

Commit

Permalink
fix(issues): 🐛 Added the issue category to the issue 'cards' #4403
Browse files Browse the repository at this point in the history
  • Loading branch information
tidusjar committed Nov 15, 2021
1 parent 0225000 commit a3739f3
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<mat-card-header>
<mat-card-title>{{issue.subject}}</mat-card-title>
<mat-card-subtitle>{{'Issues.UserOnDate' | translate: { user: issue.userReported?.userName, date: issue.createdDate | amLocal | amUserLocale | amDateFormat: 'LL' } }}</mat-card-subtitle>
<mat-card-subtitle>{{issue.issueCategory.value}}</mat-card-subtitle>
</mat-card-header>
<mat-card-content>
<p>
Expand All @@ -10,8 +11,8 @@
</mat-card-content>
<mat-card-actions>
<button mat-raised-button (click)="openChat(issue)" color="accent"><i class="far fa-comments"></i> {{'Issues.Chat' | translate }}</button>
<div *ngIf="isAdmin && settings;then content else empty">here is ignored</div>
<ng-template #content>
<div *ngIf="isAdmin && settings;then content else empty"></div>
<ng-template #content>
<button mat-raised-button color="accent"
*ngIf="issue.status === IssueStatus.Pending && settings.enableInProgress"
(click)="inProgress(issue)">{{'Issues.MarkInProgress' | translate }}</button>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
@import "~styles/variables.scss";

::ng-deep .mat-card {
background: $ombi-background-primary-accent;
}

.top-spacing {
margin-top:2%;
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { Component, Inject, OnInit, ViewEncapsulation } from "@angular/core";
import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
import { ActivatedRoute, ActivatedRouteSnapshot, Router } from "@angular/router";
import { TranslateService } from "@ngx-translate/core";
import { AuthService } from "../../../auth/auth.service";
import { IIssues, IIssueSettings, IIssuesSummary, IssueStatus, RequestType } from "../../../interfaces";
import { Component, Inject, OnInit, ViewEncapsulation } from "@angular/core";
import { IIssueSettings, IIssues, IIssuesSummary, IssueStatus, RequestType } from "../../../interfaces";
import { IssuesService, NotificationService, SettingsService } from "../../../services";
import { IssuesV2Service } from "../../../services/issuesv2.service";
import { IssueChatComponent } from "../issue-chat/issue-chat.component";
import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material/dialog';

import { AuthService } from "../../../auth/auth.service";
import { IssueChatComponent } from "../issue-chat/issue-chat.component";
import { IssuesV2Service } from "../../../services/issuesv2.service";
import { TranslateService } from "@ngx-translate/core";

export interface IssuesDetailsGroupData {
issues: IIssues[];
Expand Down Expand Up @@ -77,15 +77,15 @@ export class IssuesDetailsComponent implements OnInit {
const firstIssue = this.details.issues[0];
switch(firstIssue.requestType) {
case RequestType.movie:
this.router.navigate(['/details/movie/', firstIssue.providerId]);
this.router.navigate(['/details/movie/', this.providerId]);
return;

case RequestType.album:
this.router.navigate(['/details/artist/', firstIssue.providerId]);
this.router.navigate(['/details/artist/', this.providerId]);
return;

case RequestType.tvShow:
this.router.navigate(['/details/tv/', firstIssue.providerId]);
this.router.navigate(['/details/tv/', this.providerId]);
return;
}
}
Expand Down

0 comments on commit a3739f3

Please # to comment.