Skip to content

Commit a398d2a

Browse files
Merge branch 'stage' for v1.4.1 hotfix
2 parents f9cc48d + 42b34c2 commit a398d2a

File tree

6 files changed

+5
-6
lines changed

6 files changed

+5
-6
lines changed

src/app/applications/application-detail/application-detail.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy {
6565
this.bindApplication(this.id);
6666
this.dropdownButton = {
6767
label: '',
68-
editRouterLink: '../../edit-application/' + this.id,
68+
editRouterLink: '../edit-application/' + this.id,
6969
isErasable: true,
7070
};
7171
}

src/app/applications/datatarget/datatarget-table/datatarget-table.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
[attr.aria-label]="'DATATARGET-TABLE-ROW.SHOW-OPTIONS' | translate"></a>
3535
<ul class="dropdown-menu dropdown-menu--table" attr.aria-labelledby="tableRowDropdown-{{element.id}}">
3636
<li class="dropdown-item">
37-
<a [routerLink]="['datatarget-edit', element.id]"
37+
<a [routerLink]="['../datatarget-edit', element.id]"
3838
routerLinkActive="active">{{ 'GEN.EDIT' | translate }}</a>
3939
</li>
4040
<li class="dropdown-item">

src/app/applications/iot-devices/iot-devices-table/iot-devices-table.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
[attr.aria-label]="'APPLICATION-TABLE-ROW.SHOW-OPTIONS' | translate"></a>
9898
<ul class="dropdown-menu dropdown-menu--table" attr.aria-labelledby="tableRowDropdown-{{element.id}}">
9999
<li class="dropdown-item">
100-
<a [routerLink]="['iot-device-edit', element.id]" routerLinkActive="active">{{ 'IOTDEVICE-TABLE-ROW.EDIT'
100+
<a [routerLink]="['../iot-device-edit', element.id]" routerLinkActive="active">{{ 'IOTDEVICE-TABLE-ROW.EDIT'
101101
| translate }}
102102
</a>
103103
</li>

src/app/applications/multicast/multicast-table/multicast-table.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
[attr.aria-label]="'MULTICAST-TABLE-ROW.SHOW-OPTIONS' | translate"></a>
3535
<ul class="dropdown-menu dropdown-menu--table" attr.aria-labelledby="tableRowDropdown-{{element.id}}">
3636
<li class="dropdown-item">
37-
<a [routerLink]="['multicast-edit', element.id]"
37+
<a [routerLink]="['../multicast-edit', element.id]"
3838
routerLinkActive="active">{{ 'GEN.EDIT' | translate }}</a>
3939
</li>
4040
<li class="dropdown-item">

src/app/gateway/gateway-table/gateway-table.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<ul class="dropdown-menu dropdown-menu--table"
8080
attr.aria-labelledby="tableRowDropdown-{{ element.id }}">
8181
<li class="dropdown-item">
82-
<a [routerLink]="['gateway-edit', element.id]" routerLinkActive="active">{{ 'GEN.EDIT' |
82+
<a [routerLink]="['../gateway-edit', element.id]" routerLinkActive="active">{{ 'GEN.EDIT' |
8383
translate }}</a>
8484
</li>
8585
<li class="dropdown-item">

src/app/shared/components/top-bar/top-bar.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ export class TopBarComponent implements OnInit {
106106
) {
107107
this.router.navigate([this.backButton.routerLink]);
108108
} else {
109-
console.log('back here');
110109
this.location.back();
111110
}
112111
}

0 commit comments

Comments
 (0)