Merge branch 'stage' for v1.4.1 hotfix

OS2iot · Mar 14, 2023 · a398d2a · a398d2a
2 parents f9cc48d + 42b34c2
commit a398d2a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/src/app/applications/application-detail/application-detail.component.ts b/src/app/applications/application-detail/application-detail.component.ts
@@ -65,7 +65,7 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy {
       this.bindApplication(this.id);
       this.dropdownButton = {
         label: '',
-        editRouterLink: '../../edit-application/' + this.id,
+        editRouterLink: '../edit-application/' + this.id,
         isErasable: true,
       };
     }

diff --git a/src/app/applications/datatarget/datatarget-table/datatarget-table.component.html b/src/app/applications/datatarget/datatarget-table/datatarget-table.component.html
@@ -34,7 +34,7 @@
             [attr.aria-label]="'DATATARGET-TABLE-ROW.SHOW-OPTIONS' | translate"></a>
           <ul class="dropdown-menu dropdown-menu--table" attr.aria-labelledby="tableRowDropdown-{{element.id}}">
             <li class="dropdown-item">
-              <a [routerLink]="['datatarget-edit', element.id]"
+              <a [routerLink]="['../datatarget-edit', element.id]"
                 routerLinkActive="active">{{ 'GEN.EDIT' | translate }}</a>
             </li>
             <li class="dropdown-item">

diff --git a/src/app/applications/iot-devices/iot-devices-table/iot-devices-table.component.html b/src/app/applications/iot-devices/iot-devices-table/iot-devices-table.component.html
@@ -97,7 +97,7 @@
             [attr.aria-label]="'APPLICATION-TABLE-ROW.SHOW-OPTIONS' | translate"></a>
           <ul class="dropdown-menu dropdown-menu--table" attr.aria-labelledby="tableRowDropdown-{{element.id}}">
             <li class="dropdown-item">
-              <a [routerLink]="['iot-device-edit', element.id]" routerLinkActive="active">{{ 'IOTDEVICE-TABLE-ROW.EDIT'
+              <a [routerLink]="['../iot-device-edit', element.id]" routerLinkActive="active">{{ 'IOTDEVICE-TABLE-ROW.EDIT'
                 | translate }}
               </a>
             </li>

diff --git a/src/app/applications/multicast/multicast-table/multicast-table.component.html b/src/app/applications/multicast/multicast-table/multicast-table.component.html
@@ -34,7 +34,7 @@
               [attr.aria-label]="'MULTICAST-TABLE-ROW.SHOW-OPTIONS' | translate"></a>
             <ul class="dropdown-menu dropdown-menu--table" attr.aria-labelledby="tableRowDropdown-{{element.id}}">
               <li class="dropdown-item">
-                <a [routerLink]="['multicast-edit', element.id]"
+                <a [routerLink]="['../multicast-edit', element.id]"
                   routerLinkActive="active">{{ 'GEN.EDIT' | translate }}</a>
               </li>
               <li class="dropdown-item">

diff --git a/src/app/gateway/gateway-table/gateway-table.component.html b/src/app/gateway/gateway-table/gateway-table.component.html
@@ -79,7 +79,7 @@
                     <ul class="dropdown-menu dropdown-menu--table"
                         attr.aria-labelledby="tableRowDropdown-{{ element.id }}">
                         <li class="dropdown-item">
-                            <a [routerLink]="['gateway-edit', element.id]" routerLinkActive="active">{{ 'GEN.EDIT' |
+                            <a [routerLink]="['../gateway-edit', element.id]" routerLinkActive="active">{{ 'GEN.EDIT' |
                                 translate }}</a>
                         </li>
                         <li class="dropdown-item">

diff --git a/src/app/shared/components/top-bar/top-bar.component.ts b/src/app/shared/components/top-bar/top-bar.component.ts
@@ -106,7 +106,6 @@ export class TopBarComponent implements OnInit {
     ) {
       this.router.navigate([this.backButton.routerLink]);
     } else {
-      console.log('back here');
       this.location.back();
     }
   }