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

[ADF-1252] Create a different route for processes (#2171)

Browse Source 
Change the current route for diagram process
This commit is contained in:
Maurizio Vitale
2017-08-04 14:28:32 +01:00
committed by Denys Vuika
parent d3da5e7033
commit 83fcd5d37e
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,12 @@ export const appRoutes: Routes = [
canActivate: [AuthGuardBpm] canActivate: [AuthGuardBpm]
}, },
{ {
path: 'activiti/diagram/:processDefinitionId', path: 'activiti/apps/:appId/processes',
component: ActivitiDemoComponent,
canActivate: [AuthGuardBpm]
},
{
path: 'activiti/apps/:appId/diagram/:processDefinitionId',
component: ActivitiShowDiagramComponent, component: ActivitiShowDiagramComponent,
canActivate: [AuthGuardBpm] canActivate: [AuthGuardBpm]
}, },

5
demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
View File

@@ -149,6 +149,9 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
} }
ngOnInit() { ngOnInit() {
if (this.router.url.includes('processes') ) {
this.activeTab = 'processes';
}
this.sub = this.route.params.subscribe(params => { this.sub = this.route.params.subscribe(params => {
let applicationId = params['appId']; let applicationId = params['appId'];
if (applicationId && applicationId !== '0') { if (applicationId && applicationId !== '0') {
@@ -324,7 +327,7 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
} }
onShowProcessDiagram(event: any): void { onShowProcessDiagram(event: any): void {
this.router.navigate(['/activiti/diagram/' + event.value]); this.router.navigate(['/activiti/apps/' + this.appId + '/diagram/' + event.value]);
} }
onProcessDetailsTaskClick(event: TaskDetailsEvent): void { onProcessDetailsTaskClick(event: TaskDetailsEvent): void {

19
demo-shell-ng2/app/components/activiti/activiti-show-diagram.component.ts
View File

@@ -16,8 +16,8 @@
*/ */
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Component, OnDestroy } from '@angular/core'; import { Component } from '@angular/core';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { Subscription } from 'rxjs/Rx'; import { Subscription } from 'rxjs/Rx';
@Component({ @Component({
@@ -25,25 +25,22 @@ import { Subscription } from 'rxjs/Rx';
templateUrl: './activiti-show-diagram.component.html', templateUrl: './activiti-show-diagram.component.html',
styleUrls: ['./activiti-show-diagram.component.css'] styleUrls: ['./activiti-show-diagram.component.css']
}) })
export class ActivitiShowDiagramComponent implements OnDestroy { export class ActivitiShowDiagramComponent {
sub: Subscription;
processDefinitionId: string; processDefinitionId: string;
appId: string;
constructor(private route: ActivatedRoute, constructor(private route: ActivatedRoute,
private router: Router,
private location: Location) { private location: Location) {
this.sub = this.route.params.subscribe(params => { this.route.params.subscribe(params => {
this.processDefinitionId = params['processDefinitionId']; this.processDefinitionId = params['processDefinitionId'];
this.appId = params['appId'];
}); });
}
ngOnDestroy() {
this.sub.unsubscribe();
} }
onClickBack() { onClickBack() {
this.location.back(); this.router.navigate(['/activiti/apps/' + this.appId + '/processes']);
} }
} }