Merge branch 'bug-3897_master' of https://github.com/mmoqui/Silverpeas-Core into mmo-bug3849

Author: NicolasEYSSERIC

war-core/src/main/webapp/selection/jsp/userpanel.jsp

@@ -615,9 +615,16 @@
       
         // cancel the selection and go back to the caller.
         function cancelSelection() {
+      <c:choose>
+        <c:when test="${hotSetting}">
+          window.close();
+        </c:when>
+        <c:otherwise>
           $('input[name="UserOrGroupSelection"]').val('false');
           $("#selection").attr("action", "<c:out value='${cancelationURL}'/>");
           $("#selection").submit();
+        </c:otherwise>
+      </c:choose>
         }
         
         function highlightFilter($this) {

web-core/src/test/java/com/silverpeas/profile/web/UserProfileTestResources.java

@@ -157,15 +157,15 @@ public UserDetail[] answer(InvocationOnMock invocation) throws Throwable {
                 && !passedCriteria.isCriterionOnNameSet())) {
           return emptyUsers;
         }
-        if (criteria.isCriterionOnRoleIdsSet() && passedCriteria.isCriterionOnRoleIdsSet()) {
-          List<String> roles = Arrays.asList(criteria.getCriterionOnRoleIds());
-          List<String> passedRoles = Arrays.asList(passedCriteria.getCriterionOnRoleIds());
+        if (criteria.isCriterionOnRoleNamesSet() && passedCriteria.isCriterionOnRoleNamesSet()) {
+          List<String> roles = Arrays.asList(criteria.getCriterionOnRoleNames());
+          List<String> passedRoles = Arrays.asList(passedCriteria.getCriterionOnRoleNames());
           if (roles.size() != passedRoles.size() || !roles.containsAll(passedRoles)) {
             return emptyUsers;
           }
-        } else if ((!criteria.isCriterionOnRoleIdsSet()
-                && passedCriteria.isCriterionOnRoleIdsSet()) || (criteria.isCriterionOnRoleIdsSet()
-                && !passedCriteria.isCriterionOnRoleIdsSet())) {
+        } else if ((!criteria.isCriterionOnRoleNamesSet()
+                && passedCriteria.isCriterionOnRoleNamesSet()) || (criteria.isCriterionOnRoleNamesSet()
+                && !passedCriteria.isCriterionOnRoleNamesSet())) {
           return emptyUsers;
         }
         if (criteria.isCriterionOnUserIdsSet() && passedCriteria.isCriterionOnUserIdsSet()) {