From e47ca1e3f6f92e28af9bca77ce6156a33a1453d0 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Tue, 27 Nov 2018 14:54:28 -0600 Subject: [PATCH 1/2] fix dr-token generation token command --- ui/app/templates/components/shamir-flow.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/templates/components/shamir-flow.hbs b/ui/app/templates/components/shamir-flow.hbs index 4ce757024007..ff8f5302880a 100644 --- a/ui/app/templates/components/shamir-flow.hbs +++ b/ui/app/templates/components/shamir-flow.hbs @@ -25,7 +25,7 @@
{{#let - (concat 'vault operator generate-root -otp="' otp '" -decode="' encoded_token '"') + (concat 'vault operator generate-root -dr-token -otp="' otp '" -decode="' encoded_token '"') as |cmd|}}
From 0aa6bb903f5bff9442b5e2c62a007f013f86e164 Mon Sep 17 00:00:00 2001 From: Matthew Irish Date: Tue, 27 Nov 2018 14:57:00 -0600 Subject: [PATCH 2/2] inject version service in the status menu so we can hide the license link in the status menu --- ui/app/components/status-menu.js | 1 + ui/app/templates/partials/status/cluster.hbs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/app/components/status-menu.js b/ui/app/components/status-menu.js index 9b1e23548b2b..642ff3d8db4a 100644 --- a/ui/app/components/status-menu.js +++ b/ui/app/components/status-menu.js @@ -9,6 +9,7 @@ export default Component.extend({ auth: service(), store: service(), media: service(), + version: service(), type: 'cluster', itemTag: null, partialName: computed('type', function() { diff --git a/ui/app/templates/partials/status/cluster.hbs b/ui/app/templates/partials/status/cluster.hbs index 7fb8357ba013..f2d7862fd27e 100644 --- a/ui/app/templates/partials/status/cluster.hbs +++ b/ui/app/templates/partials/status/cluster.hbs @@ -43,7 +43,7 @@ }} {{/if}} - {{else if activeCluster.version.isOSS}} + {{else if version.isOSS}}
  • {{#link-to "vault.cluster.replication"}}
    @@ -68,7 +68,7 @@
    {{/if}} - {{#unless isOSS}} + {{#unless version.isOSS}}