inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

#1146 load right filter on create task (#1250)

Browse Source
This commit is contained in:
Mario Romano
2016-12-13 22:53:49 +00:00
committed by Eugenio Romano
parent 562fa9ec7c
commit 8d619da667
4 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ng2-components/ng2-activiti-processlist/src/components/activiti-filters.component.ts
View File

@@ -145,7 +145,7 @@ export class ActivitiProcessFilters implements OnInit, OnChanges {
/**
* Select the first filter of a list if present
*/
private selectFirstFilter() {
public selectFirstFilter() {
if (!this.isFilterListEmpty()) {
this.currentFilter = this.filters[0];
} else {

2
ng2-components/ng2-activiti-tasklist/src/components/activiti-filters.component.ts
View File

@@ -154,7 +154,7 @@ export class ActivitiFilters implements OnInit, OnChanges {
/**
* Select the first filter of a list if present
*/
private selectFirstFilter() {
public selectFirstFilter() {
if (!this.isFilterListEmpty()) {
this.currentFilter = this.filters[0];
} else {

21
ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
View File

@@ -15,7 +15,18 @@
* limitations under the License.
*/
import { Component, Input, OnInit, ViewChild, Output, EventEmitter, TemplateRef, OnChanges, SimpleChanges, DebugElement } from '@angular/core';
import {
Component,
Input,
OnInit,
ViewChild,
Output,
EventEmitter,
TemplateRef,
OnChanges,
SimpleChanges,
DebugElement
} from '@angular/core';
import { AlfrescoTranslationService, AlfrescoAuthenticationService } from 'ng2-alfresco-core';
import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
import { TaskDetailsModel } from '../models/task-details.model';
@@ -131,8 +142,8 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
*/
hasFormKey() {
return (this.taskDetails
&& this.taskDetails.formKey
&& this.taskDetails.formKey !== 'null');
&& this.taskDetails.formKey
&& this.taskDetails.formKey !== 'null');
}
isTaskActive() {
@@ -151,6 +162,10 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
(res: TaskDetailsModel) => {
this.taskDetails = res;
if (this.taskDetails.name === 'null') {
this.taskDetails.name = 'No name';
}
let endDate: any = res.endDate;
this.readOnlyForm = !!(endDate && !isNaN(endDate.getTime()));