diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.css b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.css index 07eaf92d80..67959204ff 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.css +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.css @@ -1,3 +1,7 @@ :host { width: 100%; -} \ No newline at end of file +} + +.error-dialog h3 { + margin: 16px 0; +} diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html index e34583395e..258d197f9e 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html @@ -40,4 +40,11 @@ + +
+

{{'TASK_DETAILS.ERROR.TITLE'|translate}}

+

{{'TASK_DETAILS.ERROR.DESCRIPTION'|translate}}

+ +
+
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts index 5cd482dc12..b0c8fa8746 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, Input, OnInit, ViewChild, Output, EventEmitter, TemplateRef, OnChanges, SimpleChanges } 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'; @@ -37,6 +37,9 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { @ViewChild('activitichecklist') activitichecklist: any; + @ViewChild('errorDialog') + errorDialog: DebugElement; + @Input() taskId: string; @@ -215,10 +218,15 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { } onFormError(error: any) { + this.errorDialog.nativeElement.showModal(); this.onError.emit(error); } onExecuteFormOutcome(event: FormOutcomeEvent) { this.executeOutcome.emit(event); } + + closeErrorDialog(): void { + this.errorDialog.nativeElement.close(); + } } diff --git a/ng2-components/ng2-activiti-tasklist/src/i18n/en.json b/ng2-components/ng2-activiti-tasklist/src/i18n/en.json index f55ebd1fb9..96642c6c57 100644 --- a/ng2-components/ng2-activiti-tasklist/src/i18n/en.json +++ b/ng2-components/ng2-activiti-tasklist/src/i18n/en.json @@ -33,6 +33,11 @@ }, "CHECKLIST": { "NONE": "No checklist." + }, + "ERROR": { + "TITLE": "Something went wrong", + "DESCRIPTION": "Could not complete the specified action. Please try again or check that you have permission.", + "CLOSE": "Close" } }, "TASK_FILTERS": {