Nuiton-web-commits

Download

nuiton-web-commits@list.nuiton.org

July 2014

1 participants
2 discussions

r327 - trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions
by tchemit＠users.nuiton.org July 19, 2014

July 19, 2014

Author: tchemit Date: 2014-07-19 13:14:29 +0200 (Sat, 19 Jul 2014) New Revision: 327 Url: http://forge.nuiton.org/projects/nuiton-web/repository/revisions/327 Log: using generated code has changed in ToPIA Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java 2014-07-19 09:48:45 UTC (rev 326) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java 2014-07-19 11:14:29 UTC (rev 327) @@ -61,7 +61,7 @@ public String input() throws Exception { SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); securityRoleDAO = transaction.getSecurityRoleDao(); - roles = securityRoleDAO.newQueryBuilder().setOrderByArguments(SecurityRole.NAME).findAll(); + roles = securityRoleDAO.newQueryBuilder().setOrderByArguments(SecurityRole.PROPERTY_NAME).findAll(); transaction.close(); categories = new HashMap<String, String>(); Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java 2014-07-19 09:48:45 UTC (rev 326) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java 2014-07-19 11:14:29 UTC (rev 327) @@ -52,8 +52,8 @@ SecurityTopiaPersistenceContext transaction = rootContext.newPersistenceContext(); securityUserDAO = transaction.getSecurityUserDao(); securityRoleDAO = transaction.getSecurityRoleDao(); - users = securityUserDAO.newQueryBuilder().setOrderByArguments(SecurityUser.LOGIN).findAll(); - roles = securityRoleDAO.newQueryBuilder().setOrderByArguments(SecurityRole.NAME).findAll(); + users = securityUserDAO.newQueryBuilder().setOrderByArguments(SecurityUser.PROPERTY_LOGIN).findAll(); + roles = securityRoleDAO.newQueryBuilder().setOrderByArguments(SecurityRole.PROPERTY_NAME).findAll(); transaction.close(); return super.input(); }

1 0

r326 - trunk
by tchemit＠users.nuiton.org July 19, 2014

July 19, 2014

Author: tchemit Date: 2014-07-19 11:48:45 +0200 (Sat, 19 Jul 2014) New Revision: 326 Url: http://forge.nuiton.org/projects/nuiton-web/repository/revisions/326 Log: use matching eugene version with topia Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-06-04 09:24:23 UTC (rev 325) +++ trunk/pom.xml 2014-07-19 09:48:45 UTC (rev 326) @@ -89,7 +89,7 @@  <projectId>nuiton-web</projectId> - <eugeneVersion>2.10</eugeneVersion> + <eugeneVersion>2.12-SNAPSHOT</eugeneVersion> <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonI18nVersion>3.0</nuitonI18nVersion>

1 0