diff options
| -rw-r--r-- | plugins/UsersManager/templates/index.twig | 2 | ||||
| -rw-r--r-- | tests/UI/specs/UsersManager_spec.js | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig index 9ce934ec18..be07ac9381 100644 --- a/plugins/UsersManager/templates/index.twig +++ b/plugins/UsersManager/templates/index.twig @@ -55,7 +55,7 @@ {% set accesInvalid %}<img src='plugins/UsersManager/images/no-access.png' class='updateAccess' />{% endset %} {% set superUserAccess %}<span title="{{ 'UsersManager_ExceptionSuperUserAccess'|translate }}">N/A</span>{% endset %} {% for login,access in usersAccessByWebsite %} - {% if userIsSuperUser or (hasOnlyAdminAccess and access!='noaccess') %} + {% if userIsSuperUser or (hasOnlyAdminAccess and (access!='noaccess' or idSiteSelected == 'all')) %} <tr> <td id='login'>{{ login }}</td> <td>{{ usersAliasByLogin[login]|raw }}</td> diff --git a/tests/UI/specs/UsersManager_spec.js b/tests/UI/specs/UsersManager_spec.js index 658008a6cc..1c88dbd917 100644 --- a/tests/UI/specs/UsersManager_spec.js +++ b/tests/UI/specs/UsersManager_spec.js @@ -93,4 +93,18 @@ describe("UsersManager", function () { submitGiveAccessForm(page); }); }); + + it("should ask for confirmation when all sites selected", function (done) { + assertScreenshotEquals("adminuser_all_users_loaded", done, function (page) { + page.load(url + '&idSite=all'); + }); + }); + + it("should ask for confirmation when all sites selected", function (done) { + assertScreenshotEquals("adminuser_all_users_confirmation", done, function (page) { + openGiveAccessForm(page); + setLoginOrEmailForGiveAccessForm(page, 'login5@example.com'); + submitGiveAccessForm(page); + }); + }); });
\ No newline at end of file |