aboutsummaryrefslogtreecommitdiff
path: root/juick-spring-www/src/main
diff options
context:
space:
mode:
authorGravatar Alexander Alexeev2016-12-12 23:12:35 +0700
committerGravatar Vitaly Takmazov2016-12-12 22:49:47 +0300
commitc2afc713d3748b1c4fb3453f2550d966a5743285 (patch)
treef24cac035d775dc6d788b6119b6e5064046176d0 /juick-spring-www/src/main
parentc0831038bd7bde32df5af8fb851d210daeccc853 (diff)
spring security EL simplified
Diffstat (limited to 'juick-spring-www/src/main')
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html4
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html4
-rw-r--r--juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html2
3 files changed, 5 insertions, 5 deletions
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html
index 2317369c..3b2d3bff 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/layout/partial/navigation.html
@@ -14,7 +14,7 @@
</form>
</div>
<section id="headdiv">
- <th:block th:if="${#authorization.expression('hasRole(''ROLE_USER'')')}">
+ <th:block th:if="${#authorization.expression('isAuthenticated()')}">
<nav id="user">
<ul>
<li>
@@ -48,7 +48,7 @@
</ul>
</nav>
</th:block>
- <th:block th:if="${#authorization.expression('hasRole(''ROLE_ANONYM'')')}">
+ <th:block th:if="${#authorization.expression('isAnonymous()')}">
<p>[(#{message.loginForSending(@{/login})})]</p>
</th:block>
</section>
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html
index 6b6f278d..2c5aab3b 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/index.html
@@ -3,8 +3,8 @@
xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
layout:decorate="~{layout/mainLayout}">
<head>
- <title th:if="${#authorization.expression('hasRole(''ROLE_USER'')')}" th:text="#{title.index.user}">Популярные</title>
- <title th:if="${#authorization.expression('hasRole(''ROLE_ANONYM'')')}" th:text="#{title.index.anonym}">Микроблоги Juick: популярные записи</title>
+ <title th:if="${#authorization.expression('isAuthenticated()')}" th:text="#{title.index.user}">Популярные</title>
+ <title th:if="${#authorization.expression('isAnonymous()')}" th:text="#{title.index.anonym}">Микроблоги Juick: популярные записи</title>
</head>
<body>
diff --git a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html
index df2caf7b..5b85bc5f 100644
--- a/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html
+++ b/juick-spring-www/src/main/webapp/WEB-INF/templates/views/partial/blog_postform.html
@@ -1,4 +1,4 @@
-<div th:if="${#authorization.expression('hasRole(''ROLE_USER'')')}" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
+<div th:if="${#authorization.expression('isAuthenticated()')}" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
<form action="/post" th:action="@{/post}" method="post" enctype="multipart/form-data">
<section id="newmessage">
<textarea name="body" placeholder="Новое сообщение..." th:placeholder="#{postForm.newMessage}"></textarea>