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

[ADF-3144] Error component displayed when closing file viewer in process tab (#3469)

Browse Source
This commit is contained in:
davidcanonieto
2018-06-11 16:21:48 +01:00
committed by Eugenio Romano
parent ee919ff9b4
commit 9c8adefece
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
demo-shell/src/app/app.routes.ts
View File

@@ -154,6 +154,11 @@ export const appRoutes: Routes = [
component: ProcessServiceComponent, component: ProcessServiceComponent,
canActivate: [AuthGuardBpm] canActivate: [AuthGuardBpm]
}, },
{
path: 'activiti/apps/:appId/processes/:filterId',
component: ProcessServiceComponent,
canActivate: [AuthGuardBpm]
},
{ {
path: 'activiti/apps/:appId/diagram/:processDefinitionId', path: 'activiti/apps/:appId/diagram/:processDefinitionId',
component: ShowDiagramComponent, component: ShowDiagramComponent,
@@ -164,7 +169,7 @@ export const appRoutes: Routes = [
component: ProcessServiceComponent, component: ProcessServiceComponent,
canActivate: [AuthGuardBpm] canActivate: [AuthGuardBpm]
}, },
// TODO: check if neeeded // TODO: check if needed
{ {
path: 'activiti/appId/:appId', path: 'activiti/appId/:appId',
component: ProcessServiceComponent, component: ProcessServiceComponent,

6
demo-shell/src/app/components/process-service/process-service.component.ts
View File

@@ -142,8 +142,8 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
presetColoum = 'default'; presetColoum = 'default';
showTaskTab = true; showTaskTab: boolean;
showProcessTab = false; showProcessTab: boolean;
fieldValidators = [ fieldValidators = [
...FORM_FIELD_VALIDATORS, ...FORM_FIELD_VALIDATORS,
@@ -208,6 +208,8 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit
if (this.router.url.includes('processes')) { if (this.router.url.includes('processes')) {
this.activeTab = this.tabs.processes; this.activeTab = this.tabs.processes;
} }
this.showProcessTab = this.activeTab === this.tabs.processes;
this.showTaskTab = this.activeTab === this.tabs.tasks;
this.route.params.subscribe(params => { this.route.params.subscribe(params => {
const applicationId = params['appId']; const applicationId = params['appId'];