Author: echatellier Date: 2014-06-26 23:26:35 +0200 (Thu, 26 Jun 2014) New Revision: 275 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/275 Log: Rename fullpath to completename (reserved keyword) Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-06-26 21:26:35 UTC (rev 275) @@ -454,7 +454,7 @@ public List<FaxToMailUserGroup> getAllGroups() { FaxToMailUserGroupTopiaDao faxToMailUserGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); - return faxToMailUserGroupDao.forAll().setOrderByArguments(FaxToMailUserGroup.PROPERTY_FULL_PATH).findAll(); + return faxToMailUserGroupDao.forAll().setOrderByArguments(FaxToMailUserGroup.PROPERTY_COMPLETE_NAME).findAll(); } /** Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/InitFaxToMailService.java 2014-06-26 21:26:35 UTC (rev 275) @@ -160,13 +160,13 @@ // user groups FaxToMailUserGroupTopiaDao userGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Chargés de clientèle", - FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/Chargés de clientèle"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/Chargés de clientèle"); FaxToMailUserGroup commerciauxGroup = userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Commerciaux", - FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/Commerciaux"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/Commerciaux"); FaxToMailUserGroup savGroup = userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "SAV", - FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/SAV"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/SAV"); userGroupDao.create(FaxToMailUserGroup.PROPERTY_NAME, "Administrateurs", - FaxToMailUserGroup.PROPERTY_FULL_PATH, "Franciaflex/Administrateurs"); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, "Franciaflex/Administrateurs"); FaxToMailUserTopiaDao userDao = getPersistenceContext().getFaxToMailUserDao(); FaxToMailUser marc = userDao.create(FaxToMailUser.PROPERTY_LAST_NAME, "Lefèbvre", Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapService.java 2014-06-26 21:26:35 UTC (rev 275) @@ -108,7 +108,7 @@ * @param groupCN * @return */ - protected String getGroupFullPath(String groupCN) { + protected String getGroupCompleteName(String groupCN) { String[] parts = groupCN.split(","); ArrayUtils.reverse(parts); @@ -307,13 +307,13 @@ String[] groups = searchEntry.getAttributeValues("memberOf"); if (ArrayUtils.isNotEmpty(groups)) { for (String group : groups) { - String groupPath = getGroupFullPath(group); + String groupPath = getGroupCompleteName(group); String groupName = StringUtils.substringAfterLast(groupPath, "/"); FaxToMailUserGroup userGroup = faxtomailUserGroupDao.forNameEquals(groupName).findUniqueOrNull(); if (userGroup == null) { userGroup = faxtomailUserGroupDao.create( FaxToMailUserGroup.PROPERTY_NAME, groupName, - FaxToMailUserGroup.PROPERTY_FULL_PATH, groupPath); + FaxToMailUserGroup.PROPERTY_COMPLETE_NAME, groupPath); } user.addUserGroups(userGroup); } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-26 21:26:35 UTC (rev 275) @@ -687,7 +687,7 @@ <tbody> <tr ng-repeat="group in parentScopeValues.rightGroups" class="parentInfos"> <td> - <span class="fa fa-users"></span> {{group.fullPath}} + <span class="fa fa-users"></span> {{group.completeName}} </td> <td> <label><input type="checkbox" ng-checked="parentScopeValues.readRightGroups.containsByTopiaId(group)" disabled> Lecture</label> @@ -709,7 +709,7 @@ <tbody> <tr ng-repeat="group in selectedMailFolder.rightGroups"> <td> - <span class="fa fa-users"></span> {{group.fullPath}} + <span class="fa fa-users"></span> {{group.completeName}} <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeRightGroup($index, group)"> <span class="glyphicon glyphicon-remove"></span> </a> @@ -775,7 +775,7 @@ <div class="form-group"> <label for="newRightGroupField" class="control-label">Nouveau groupe :</label> <select id="newRightGroupField" class="form-control" - ng-model="newRightGroup" ng-options="group as group.fullPath for group in groups"> + ng-model="newRightGroup" ng-options="group as group.completeName for group in groups"> </select> <a class="btn btn-success btn-xs" ng-click="addRightGroup()" ng-disabled="!newRightGroup"> <span class="glyphicon glyphicon-plus"></span> @@ -809,7 +809,7 @@ <tbody> <tr ng-repeat="group in selectedMailFolder.rightGroups"> <td> - <span class="fa fa-users"></span> {{group.fullPath}} + <span class="fa fa-users"></span> {{group.completeName}} <a class="pull-right btn btn-danger btn-xs pull-right" ng-click="removeRightGroup($index, group)"> <span class="glyphicon glyphicon-remove"></span> </a> @@ -855,7 +855,7 @@ <div class="form-group"> <label for="newRightGroupField" class="control-label">Nouveau groupe :</label> <select id="newRightGroupField" class="form-control" - ng-model="newRightGroup" ng-options="group as group.fullPath for group in groups"> + ng-model="newRightGroup" ng-options="group as group.completeName for group in groups"> </select> <a class="btn btn-success btn-xs" ng-click="addRightGroup()" ng-disabled="!newRightGroup"> <span class="glyphicon glyphicon-plus"></span> @@ -1031,7 +1031,7 @@ <tr ng-repeat="groupChef in configuration.chefs" ng-class="{'info' : groupChef == selectedGroupChef}" ng-click="editGroupChef(groupChef)"> - <td>{{groupChef.userGroup ? groupChef.userGroup.fullPath : '(aucun groupe)'}} + <td>{{groupChef.userGroup ? groupChef.userGroup.completeName : '(aucun groupe)'}} <a class="btn btn-danger btn-xs pull-right" ng-click="removeGroupChef(groupChef, $index)"> <span class="glyphicon glyphicon-remove"></span> </a> @@ -1052,7 +1052,7 @@ <label for="groupChefUserGroupField" class="control-label">Chef du groupe : </label> <select id="groupChefUserGroupField" class="form-control" ng-required="selectedGroupChef" ng-model="selectedGroupChef.userGroup" - ng-options="group as group.fullPath for group in groups"> + ng-options="group as group.completeName for group in groups"> <option value="" ng-if="!selectedGroupChef.userGroup"></option> </select> </div> @@ -1069,7 +1069,7 @@ <tr ng-repeat="group in selectedGroupChef.managedGroups"> <td> <span class="fa fa-users"></span> - {{group.fullPath}} + {{group.completeName}} <a class="btn btn-danger btn-xs pull-right" ng-click="removeManagedGroup($index)"> <span class="glyphicon glyphicon-remove"></span> </a> @@ -1084,7 +1084,7 @@ <div class="form-group"> <label for="newManagedGroupField" class="control-label">Nouveau groupe :</label> <select id="newManagedGroupField" class="form-control" - ng-model="newManagedGroup" ng-options="group as group.fullPath for group in groups" width="'100%'" searchContains="true"> + ng-model="newManagedGroup" ng-options="group as group.completeName for group in groups" width="'100%'" searchContains="true"> </select> <a class="btn btn-success btn-xs" ng-click="addManagedGroup()" ng-disabled="!newManagedGroup"> <span class="glyphicon glyphicon-plus"></span> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-26 21:22:45 UTC (rev 274) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-26 21:26:35 UTC (rev 275) @@ -43,7 +43,7 @@ <!-- Current user groups : <s:iterator value="authenticatedUser.userGroups"> - - <s:property value="fullPath" /> + - <s:property value="completeName" /> </s:iterator> --> </head>