Merge branch 'master' into VLTFE-19-default-auth-other

hashicorp · Jan 24, 2020 · 72d810f · 72d810f
2 parents ff6f136 + 24c1c28
commit 72d810f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,12 @@ BUG FIXES:
 
 * ui: Update headless Chrome flag to fix `yarn run test:oss` [GH-8035]
 
+## 1.3.3 (Unreleased)
+
+BUG FIXES:
+
+* ui: Fix missing License menu item [GH-8230]
+
 ## 1.3.2 (January 22nd, 2020)
 
 SECURITY:

diff --git a/ui/app/templates/partials/status/cluster.hbs b/ui/app/templates/partials/status/cluster.hbs
@@ -68,8 +68,7 @@
       {{#if (and (or
         (and version.features (has-permission 'status' routeParams='license'))
         (and cluster.usingRaft (has-permission 'status' routeParams='raft'))
-        )
-        not cluster.dr.isSecondary)
+        ) (not cluster.dr.isSecondary))
       }}
         <nav class="menu">
           <div class="menu-label">