branch develop updated (b120554 -> 5a6614e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git from b120554 Fix build new 5a6614e Update struts to 2.5.2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 5a6614e1b6e8b00257538e4d9ae80c6c7676fe4a Author: CHRE <CHATELLIER@codelutin.com> Date: Wed Oct 5 17:56:42 2016 +0200 Update struts to 2.5.2 Summary of changes: .../src/main/resources/WEB-INF/security/role-permissions.jsp | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-web. See https://gitlab.nuiton.org/nuiton/nuiton-web.git commit 5a6614e1b6e8b00257538e4d9ae80c6c7676fe4a Author: CHRE <CHATELLIER@codelutin.com> Date: Wed Oct 5 17:56:42 2016 +0200 Update struts to 2.5.2 --- .../src/main/resources/WEB-INF/security/role-permissions.jsp | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp b/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp index cd883b3..5f03e5d 100644 --- a/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp +++ b/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp @@ -41,7 +41,7 @@ </s:iterator> <table class="security-table"> <s:iterator value="categories.keys" var="category"> - <s:set name="categoryName" value="categories.get(#category)" /> + <s:set var="categoryName" value="categories.get(#category)" /> <tr> <th colspan="<s:property value="roles.size() + 1" />"><s:property value="#categoryName" /></th> </tr> @@ -58,7 +58,7 @@ </tr> <s:iterator value="categoryPermissions.get(#category)" var="categoryPermission"> - <s:set name="permissionName" value="permissions.get(#categoryPermission)" /> + <s:set var="permissionName" value="permissions.get(#categoryPermission)" /> <tr> <td><s:property value="#permissionName" /></td> <s:iterator value="roles" var="role"> diff --git a/pom.xml b/pom.xml index e30d107..4ea03f1 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ License along with this program. If not, see <gwtPluginVersion>2.2.0</gwtPluginVersion> <!-- Strust 2 --> - <struts2Version>2.5.1</struts2Version> + <struts2Version>2.5.2</struts2Version> <shiroVersion>1.2.5</shiroVersion> <servletApiVersion>3.0.1</servletApiVersion> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm