From 7aeab9fe20219e54f81a497b298c0137eb10dee3 Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Mon, 8 Feb 2016 16:48:20 -0500 Subject: [PATCH 001/155] Fixed sort order of the file table on the Grant FIle Access and File Access popups on the File Permissions pg. [ref #2572] --- src/main/java/Bundle.properties | 2 +- .../webapp/permissions-manage-files.xhtml | 29 ++++++++++++------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties index c922a5868fa..1b358e69e53 100755 --- a/src/main/java/Bundle.properties +++ b/src/main/java/Bundle.properties @@ -533,7 +533,7 @@ dataverse.permissionsFiles.assignDialog.userOrGroup.title=User/Group dataverse.permissionsFiles.assignDialog.userOrGroup.enterName=Enter User/Group Name dataverse.permissionsFiles.assignDialog.userOrGroup.invalidMsg=No matches found. dataverse.permissionsFiles.assignDialog.userOrGroup.requiredMsg=Please select at least one user or group. -dataverse.permissionsFiles.assignDialog.file=File +dataverse.permissionsFiles.assignDialog.fileName=File Name dataverse.permissionsFiles.assignDialog.grantBtn=Grant dataverse.permissionsFiles.assignDialog.rejectBtn=Reject diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml index e69fcd84f06..44b5fdc333d 100644 --- a/src/main/webapp/permissions-manage-files.xhtml +++ b/src/main/webapp/permissions-manage-files.xhtml @@ -176,7 +176,7 @@
@@ -188,9 +188,11 @@
- + + + +
@@ -234,10 +236,10 @@ - + @@ -245,19 +247,24 @@
+ + + actionListener="#{manageFilePermissionsPage.grantAccessToRequests(manageFilePermissionsPage.fileRequester)}" oncomplete="PF('assignWidget').hide();"> + + + + actionListener="#{manageFilePermissionsPage.rejectAccessToRequests(manageFilePermissionsPage.fileRequester)}" oncomplete="PF('assignWidget').hide();"> + + +
From 625e980db68317ea715714f24a71a0309f558f00 Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Mon, 8 Feb 2016 22:54:30 -0500 Subject: [PATCH 002/155] Added counter to dataTables in the File Permissions pg, plus prototype for dynamic "selected" counter in the access action popups. [ref #2716] --- .../dataverse/ManageFilePermissionsPage.java | 6 +- .../webapp/permissions-manage-files.xhtml | 55 ++++++++++++++++++- 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/ManageFilePermissionsPage.java b/src/main/java/edu/harvard/iq/dataverse/ManageFilePermissionsPage.java index 7d5c15a0867..4984ca55668 100644 --- a/src/main/java/edu/harvard/iq/dataverse/ManageFilePermissionsPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/ManageFilePermissionsPage.java @@ -37,6 +37,7 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import org.apache.commons.lang.StringUtils; +import org.primefaces.event.SelectEvent; /** * @@ -226,6 +227,10 @@ public void setSelectedRoleAssignmentRows(List selectedRoleAs this.selectedRoleAssignmentRows = selectedRoleAssignmentRows; } + public void rowSelected(SelectEvent event) { + // System.out.println("rowSelected"); + } + public void initViewRemoveDialogByFile(DataFile file, List raRows) { this.selectedFile = file; this.selectedRoleAssignee = null; @@ -466,7 +471,6 @@ public void setRenderFileMessages(boolean renderFileMessages) { - // inner class used fordisplay of role assignments public static class RoleAssignmentRow { diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml index 44b5fdc333d..cbaeac07aef 100644 --- a/src/main/webapp/permissions-manage-files.xhtml +++ b/src/main/webapp/permissions-manage-files.xhtml @@ -49,6 +49,10 @@
+

+ #{manageFilePermissionsPage.fileAccessRequestMap.size()} Requests +

+ @@ -84,6 +88,11 @@
+ +

+ #{manageFilePermissionsPage.roleAssigneeMap.size()} Users/Groups +

+ @@ -130,6 +139,11 @@ + +

+ #{manageFilePermissionsPage.fileMap.size()} Restricted Files +

+ @@ -175,9 +189,26 @@
+ +

+ Selecting #{manageFilePermissionsPage.selectedFiles.size()} of + + #{manageFilePermissionsPage.roleAssignments.size()} + + #{!empty manageFilePermissionsPage.selectedFile ? 'Users/Groups' : 'Restricted Files'} + + +

+ + + + + + + @@ -231,13 +262,35 @@
-
+
+ +

+ Selecting #{manageFilePermissionsPage.selectedFiles.size()} of + + #{!empty manageFilePermissionsPage.fileRequester ? + manageFilePermissionsPage.fileAccessRequestMap.get(manageFilePermissionsPage.fileRequester).size() + : + manageFilePermissionsPage.fileMap.size()} + + #{!empty manageFilePermissionsPage.fileRequester ? + 'Requested Files' + : + 'Restricted Files'} + +

+ + + + + + + From ee5b647eb14cb1875288ee1253d5e9d0cb30d8e5 Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Mon, 8 Feb 2016 23:20:52 -0500 Subject: [PATCH 003/155] Cleaned up the layout of the access action popups on the File Permissions pg. [ref #2716] --- .../webapp/permissions-manage-files.xhtml | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/main/webapp/permissions-manage-files.xhtml b/src/main/webapp/permissions-manage-files.xhtml index cbaeac07aef..676efb25e31 100644 --- a/src/main/webapp/permissions-manage-files.xhtml +++ b/src/main/webapp/permissions-manage-files.xhtml @@ -187,7 +187,7 @@
- +

@@ -228,7 +228,7 @@

- +
@@ -243,7 +243,7 @@ #{bundle['dataverse.permissionsFiles.assignDialog.userOrGroup']} -
+
-
- -

- Selecting #{manageFilePermissionsPage.selectedFiles.size()} of - - #{!empty manageFilePermissionsPage.fileRequester ? - manageFilePermissionsPage.fileAccessRequestMap.get(manageFilePermissionsPage.fileRequester).size() - : - manageFilePermissionsPage.fileMap.size()} - - #{!empty manageFilePermissionsPage.fileRequester ? - 'Requested Files' - : - 'Restricted Files'} - -

- - - - - - - - - - - - - - -
+
+
+ +

+ Selecting #{manageFilePermissionsPage.selectedFiles.size()} of + + #{!empty manageFilePermissionsPage.fileRequester ? + manageFilePermissionsPage.fileAccessRequestMap.get(manageFilePermissionsPage.fileRequester).size() + : + manageFilePermissionsPage.fileMap.size()} + + #{!empty manageFilePermissionsPage.fileRequester ? + 'Requested Files' + : + 'Restricted Files'} + +

+ + + + + + + + + + + + + +
Date: Tue, 9 Feb 2016 10:45:07 -0500 Subject: [PATCH 004/155] Added role description to the Assign Role popup on the Dataverse/Dataset Permissions pg. [ref #2658] --- src/main/webapp/roles-assign.xhtml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/roles-assign.xhtml b/src/main/webapp/roles-assign.xhtml index 6b4b9c36af0..27f132c5baf 100644 --- a/src/main/webapp/roles-assign.xhtml +++ b/src/main/webapp/roles-assign.xhtml @@ -3,6 +3,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" + xmlns:jsf="http://xmlns.jcp.org/jsf" xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs"> @@ -44,8 +45,8 @@ -
-
+
+
-
+

#{bundle['dataverse.permissions.usersOrGroups.assignDialog.role.description']}

#{managePermissionsPage.assignedRole.name} +
#{managePermissionsPage.assignedRole.description}
#{prm} From 888af360550385ed577643da6832bb9f61b99621 Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Tue, 9 Feb 2016 12:21:35 -0500 Subject: [PATCH 005/155] Added counter to the Users/Groups table on the Dataverse/Dataset Permissions pg. [ref #2716] --- src/main/webapp/permissions-manage.xhtml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/webapp/permissions-manage.xhtml b/src/main/webapp/permissions-manage.xhtml index c354c76a92d..3b52f449e56 100644 --- a/src/main/webapp/permissions-manage.xhtml +++ b/src/main/webapp/permissions-manage.xhtml @@ -107,6 +107,10 @@
+

+ #{managePermissionsPage.roleAssignments.size()} Users/Groups +

+ From d15c27b757753988da4ca11658aded151e487fc4 Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Tue, 9 Feb 2016 15:19:39 -0500 Subject: [PATCH 006/155] Added tooltip to the Group Identifier label in the Create Group popup on the Manage Groups pg. Also fixed CSS issue with tooltips displaying behind popups. [ref #2254] --- src/main/java/Bundle.properties | 1 + .../webapp/explicitGroup-new-dialog.xhtml | 39 ++++++++++--------- src/main/webapp/resources/css/structure.css | 4 +- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/main/java/Bundle.properties b/src/main/java/Bundle.properties index 1b358e69e53..f50f3df8e69 100755 --- a/src/main/java/Bundle.properties +++ b/src/main/java/Bundle.properties @@ -580,6 +580,7 @@ dataverse.permissions.explicitGroupEditDialog.title.new=Create Group dataverse.permissions.explicitGroupEditDialog.title.edit=Edit Group {0} dataverse.permissions.explicitGroupEditDialog.help=Add users or other groups to this group. dataverse.permissions.explicitGroupEditDialog.groupIdentifier=Group Identifier +dataverse.permissions.explicitGroupEditDialog.groupIdentifier.tip=Short name used for the ID of this group. dataverse.permissions.explicitGroupEditDialog.groupIdentifier.required=Group identifier cannot be empty dataverse.permissions.explicitGroupEditDialog.groupIdentifier.invalid=Group identifier can contain only letters, digits, underscores (_) and dashes (-) dataverse.permissions.explicitGroupEditDialog.groupIdentifier.helpText=Consists of letters, digits, underscores (_) and dashes (-) diff --git a/src/main/webapp/explicitGroup-new-dialog.xhtml b/src/main/webapp/explicitGroup-new-dialog.xhtml index e9c336845b7..24d38f100ea 100644 --- a/src/main/webapp/explicitGroup-new-dialog.xhtml +++ b/src/main/webapp/explicitGroup-new-dialog.xhtml @@ -4,7 +4,7 @@ xmlns:p="http://primefaces.org/ui" xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs"> - +
@@ -14,45 +14,48 @@

#{bundle['dataverse.permissions.explicitGroupEditDialog.help']}

-
-
-