Update screenshots and minor fixes from demo creation
This commit is contained in:
parent
f99d6fdf89
commit
f476d3fb35
BIN
.github/boards.png
vendored
BIN
.github/boards.png
vendored
Binary file not shown.
Before Width: | Height: | Size: 435 KiB After Width: | Height: | Size: 486 KiB |
BIN
.github/settings.png
vendored
BIN
.github/settings.png
vendored
Binary file not shown.
Before Width: | Height: | Size: 728 KiB After Width: | Height: | Size: 727 KiB |
BIN
.github/tasks.png
vendored
BIN
.github/tasks.png
vendored
Binary file not shown.
Before Width: | Height: | Size: 522 KiB After Width: | Height: | Size: 674 KiB |
@ -56,7 +56,7 @@ export class BoardService {
|
||||
retVal.html = callback(false, marked(markdown));
|
||||
|
||||
if (doCount) {
|
||||
retVal.counts = this.checkCounts;
|
||||
retVal.counts = Object.assign({}, this.checkCounts);
|
||||
}
|
||||
|
||||
return retVal;
|
||||
|
@ -669,8 +669,16 @@ export class ColumnDisplayComponent implements OnInit, OnDestroy {
|
||||
private updateTaskActivity(id: number) {
|
||||
this.viewTaskActivities = [];
|
||||
|
||||
if (this.activeUser.security_level > 2) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.boardService.getTaskActivity(id)
|
||||
.subscribe(response => {
|
||||
if (response.data.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
response.data[1].forEach((item: any) => {
|
||||
this.viewTaskActivities.push(
|
||||
new ActivitySimple(item.text, item.timestamp));
|
||||
@ -691,23 +699,24 @@ export class ColumnDisplayComponent implements OnInit, OnDestroy {
|
||||
updatedTask.ownAttachment,
|
||||
updatedTask.sharedUser,
|
||||
updatedTask.sharedCategory);
|
||||
|
||||
task.html = updatedTask.html;
|
||||
task.comments.forEach(comment => {
|
||||
this.boardService.convertMarkdown(comment.text, this.markedCallback)
|
||||
.then(data => { comment.html = data.html; });
|
||||
});
|
||||
|
||||
return task;
|
||||
}
|
||||
|
||||
private replaceUpdatedTask(updatedTask: any) {
|
||||
this.activeBoard.columns.forEach(column => {
|
||||
if (+column.id !== +updatedTask.column_id) {
|
||||
return;
|
||||
}
|
||||
const oldTask = this.activeBoard.columns
|
||||
.find(column => +column.id === +updatedTask.column_id)
|
||||
.tasks.find(task => +task.id === +updatedTask.id);
|
||||
|
||||
column.tasks.forEach(task => {
|
||||
if (+task.id !== +updatedTask.id) {
|
||||
return;
|
||||
}
|
||||
updatedTask.html = oldTask.html;
|
||||
|
||||
this.updateTaskComments(task, updatedTask.ownComment);
|
||||
});
|
||||
});
|
||||
this.updateTaskComments(oldTask, updatedTask.ownComment);
|
||||
}
|
||||
|
||||
private updateTaskComments(task: Task, newComments: any[]) {
|
||||
|
@ -6,7 +6,6 @@ import {
|
||||
OnDestroy,
|
||||
OnInit,
|
||||
Output,
|
||||
ChangeDetectorRef,
|
||||
} from '@angular/core';
|
||||
import { DomSanitizer } from '@angular/platform-browser';
|
||||
|
||||
@ -62,8 +61,7 @@ export class TaskDisplayComponent implements OnInit, OnDestroy {
|
||||
public boardService: BoardService,
|
||||
public modal: ModalService,
|
||||
private notes: NotificationsService,
|
||||
public stringsService: StringsService,
|
||||
private cdref: ChangeDetectorRef) {
|
||||
public stringsService: StringsService) {
|
||||
this.onUpdateBoards = new EventEmitter<any>();
|
||||
this.percentComplete = 0;
|
||||
this.subs = [];
|
||||
|
Reference in New Issue
Block a user