Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UI - Correct the DR token command #5857

Merged
merged 2 commits into from
Nov 27, 2018
Merged

UI - Correct the DR token command #5857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e47ca1e
fix dr-token generation token command
meirish Nov 27, 2018
0aa6bb9
inject version service in the status menu so we can hide the license …
meirish Nov 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ui/app/components/status-menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export default Component.extend({
auth: service(),
store: service(),
media: service(),
version: service(),
type: 'cluster',
itemTag: null,
partialName: computed('type', function() {
Expand Down
2 changes: 1 addition & 1 deletion ui/app/templates/components/shamir-flow.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</div>
<div class="message is-list has-copy-button" tabindex="-1">
{{#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|}}
<HoverCopyButton @copyValue={{cmd}} />
<div class="message-body">
Expand Down
4 changes: 2 additions & 2 deletions ui/app/templates/partials/status/cluster.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
}}
{{/if}}
</li>
{{else if activeCluster.version.isOSS}}
{{else if version.isOSS}}
<li>
{{#link-to "vault.cluster.replication"}}
<div class="level is-mobile">
Expand All @@ -68,7 +68,7 @@
</nav>
<hr/>
{{/if}}
{{#unless isOSS}}
{{#unless version.isOSS}}
<nav class="menu">
<div class="menu-label">
License
Expand Down