Fixed the "logout" button.

rapidoid · Feb 27, 2017 · 25cc5a0 · 25cc5a0
1 parent 099c41e
commit 25cc5a0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPage.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPage.java
@@ -205,6 +205,7 @@ private Map<String, Object> has() {
 		has.put("path", HtmlPageUtils.HAS_PATH);
 		has.put("zone", HtmlPageUtils.HAS_ZONE);
 		has.put("page", HtmlPageUtils.HAS_PAGE);
+		has.put("special_page", HtmlPageUtils.HAS_SPECIAL_PAGE);
 
 		return has;
 	}

diff --git a/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPageUtils.java b/rapidoid-gui/src/main/java/org/rapidoid/gui/HtmlPageUtils.java
@@ -7,6 +7,7 @@
 import org.rapidoid.gui.reqinfo.ReqInfo;
 import org.rapidoid.http.HttpVerb;
 import org.rapidoid.render.Getter;
+import org.rapidoid.util.Msc;
 
 /*
  * #%L
@@ -39,6 +40,13 @@ public Object get(String page) {
 		}
 	};
 
+	static final Getter HAS_SPECIAL_PAGE = new Getter() {
+		@Override
+		public Object get(String page) {
+			return ReqInfo.get().hasRoute(HttpVerb.GET, Msc.specialUri(page));
+		}
+	};
+
 	static final Getter HAS_ROLE = new Getter() {
 		@Override
 		public Object get(String role) {

diff --git a/rapidoid-html/src/main/resources/default/templates/page-segments/page-menu.html b/rapidoid-html/src/main/resources/default/templates/page-segments/page-menu.html
@@ -45,11 +45,11 @@
             <i class="fa fa-user"></i> ${username}
         </a>
         </li>
-        {{?has.page.$_logout}}
+        {{?has.special_page.logout}}
         <li>
             <a href="${req.contextPath}${logoutUri}" data-toggle="tooltip" data-placement="bottom" title="Logout"><i class="fa fa-sign-out"></i></a>
         </li>
-        {{/has.page.$_logout}}
+        {{/has.special_page.logout}}
     </ul>
     {{/username}}