nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug/826 The tasks don't show the correct associated classification

This commit is contained in:
Jose Ignacio Recuerda Cambil 2019-03-08 10:53:28 +01:00 committed by Martin Rojas Miguel Angel
parent f21024cc9a
commit 99bd8118b7
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/app/workplace/taskdetails/general/general-fields.component.html
View File

@ -65,9 +65,13 @@
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu" *dropdownMenu> <ul class="dropdown-menu" *dropdownMenu>
<li> <li *ngFor="let classification of classifications" (click)="selectClassification(classification)">
<a *ngFor="let classification of classifications" (click)="selectClassification(classification)"> <a>
{{classification.name}} <label>
<span class="material-icons md-20 blue ">{{classification.name === task.classificationSummaryResource?.name ?
'check_box': 'check_box_outline_blank'}} </span>
<span> {{classification.name}} </span>
</label>
</a> </a>
</li> </li>
</ul> </ul>

1
web/src/app/workplace/taskdetails/general/general-fields.component.ts
View File

@ -52,7 +52,6 @@ export class TaskdetailsGeneralFieldsComponent implements OnInit, OnChanges {
this.classificationService.getClassifications().subscribe(classificationList => { this.classificationService.getClassifications().subscribe(classificationList => {
this.requestInProgress = false; this.requestInProgress = false;
this.classifications = classificationList; this.classifications = classificationList;
if (classificationList.length > 0) { this.task.classificationSummaryResource = classificationList[0]; }
this.classificationsReceived.emit(this.classifications); this.classificationsReceived.emit(this.classifications);
}); });
} }

12
web/src/app/workplace/taskmaster/task-master.component.ts
View File

@ -154,11 +154,11 @@ export class TaskMasterComponent implements OnInit, OnDestroy {
} }
ngOnDestroy(): void { ngOnDestroy(): void {
this.taskChangeSubscription.unsubscribe(); if (this.taskChangeSubscription) { this.taskChangeSubscription.unsubscribe(); }
this.taskDeletedSubscription.unsubscribe(); if (this.taskDeletedSubscription) { this.taskDeletedSubscription.unsubscribe(); }
this.workbasketChangeSubscription.unsubscribe(); if (this.workbasketChangeSubscription) { this.workbasketChangeSubscription.unsubscribe(); }
this.taskAddedSubscription.unsubscribe(); if (this.taskAddedSubscription) { this.taskAddedSubscription.unsubscribe(); }
this.orientationSubscription.unsubscribe(); if (this.orientationSubscription) { this.orientationSubscription.unsubscribe(); }
this.objectReferenceSubscription.unsubscribe(); if (this.objectReferenceSubscription) { this.objectReferenceSubscription.unsubscribe(); }
} }
} }