Skip to content

Commit 8b08032

Browse files
authored
Merge pull request #404 from navikt/v2.1
V2.1 [PROD] alt+a hotkey: åpne i samme tab
2 parents 472b548 + 008c7c0 commit 8b08032

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/main.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
build-and-push:
3232
name: Build and push Docker container
33-
if: github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master'
33+
if: github.ref == 'refs/heads/v2.1' || github.ref == 'refs/heads/master'
3434
runs-on: ubuntu-latest
3535
permissions:
3636
packages: write
@@ -51,7 +51,7 @@ jobs:
5151
deploy-qa:
5252
name: Deploy to preprod
5353
needs: build-and-push
54-
if: github.ref == 'refs/heads/dev'
54+
if: github.ref == 'refs/heads/v2.1'
5555
runs-on: ubuntu-latest
5656
permissions:
5757
contents: read

src/components/lenker.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ function lagHotkeys(fnr: string, aktorId: string, enhet: string): Array<Hotkey>
9696
},
9797
{
9898
key: { char: 'A', altKey: true },
99-
action: openUrl(aktivitetsplanUrl(fnr, enhet)),
99+
action: () => window.location.assign(aktivitetsplanUrl(fnr, enhet)),
100100
description: 'Gå til aktivitetsplan'
101101
}
102102
];

0 commit comments

Comments
 (0)