Skip to content

Commit f5b77ea

Browse files
committed
fix role assign, add logging for revoke debugging
1 parent 455759e commit f5b77ea

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

src/main/java/edu/harvard/iq/dataverse/ManagePermissionsPage.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ public RoleAssignment getSelectedRoleAssignment() {
151151
}
152152

153153
public void setSelectedRoleAssignment(RoleAssignment selectedRoleAssignment) {
154+
logger.info("Selecting ra: " + selectedRoleAssignment.toString());
154155
this.selectedRoleAssignment = selectedRoleAssignment;
155156
}
156157

@@ -187,6 +188,11 @@ public List<RoleAssignmentRow> initRoleAssignments() {
187188
}
188189

189190
public void removeRoleAssignment() {
191+
if(selectedRoleAssignment != null) {
192+
logger.info("revoking " + selectedRoleAssignment.toString());
193+
} else {
194+
logger.info("No RA to revoke");
195+
}
190196
revokeRole(selectedRoleAssignment);
191197

192198
if (dvObject instanceof Dataverse) {

src/main/webapp/permissions-manage.xhtml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@
105105
<p:commandLink id="userGroupsAdd" styleClass="btn btn-default"
106106
actionListener="#{managePermissionsPage.initAssigneeDialog}"
107107
update="userGroupDialog roleAssignmentHistory"
108-
oncomplete="PF('userGroupsForm').show();handleResizeDialog('userGroupDialog');">
108+
oncomplete="PF('userGroupsForm').show();handleResizeDialog('userGroupDialog');"
109+
process='@this'>
109110
<span class="glyphicon glyphicon-user"/> #{bundle['dataverse.permissions.usersOrGroups.assignBtn']}
110111
</p:commandLink>
111112
</div>
@@ -133,8 +134,9 @@
133134
</h:outputFormat>
134135
<p:commandLink styleClass="btn btn-default"
135136
rendered="#{managePermissionsPage.dvObject eq roleAssignment.definitionPoint}"
136-
onclick="PF('confirmation').show()">
137-
<f:setPropertyActionListener value="#{roleAssignment.roleAssignment}" target="#{managePermissionsPage.selectedRoleAssignment}" />
137+
process="assignedRoles"
138+
oncomplete="PF('confirmation').show()">
139+
<f:setPropertyActionListener value="#{roleAssignment.roleAssignment}" target="#{managePermissionsPage.selectedRoleAssignment}"/>
138140
<span class="glyphicon glyphicon-remove"/> #{bundle['dataverse.permissions.usersOrGroups.removeBtn']}
139141
</p:commandLink>
140142
</p:column>

src/main/webapp/roles-assign.xhtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@
9191
<p:commandButton styleClass="btn btn-default" value="#{bundle.saveChanges}"
9292
update="assignRoleContent assignedRoles roleAssignmentHistory @([id$=Messages])"
9393
actionListener="#{managePermissionsPage.assignRole}"
94-
oncomplete="if (args &amp;&amp; !args.validationFailed) PF('userGroupsForm').hide();">
94+
oncomplete="if (args &amp;&amp; !args.validationFailed) PF('userGroupsForm').hide();"
95+
process="userGroupNameAssign assignRoleRadios @this">
9596
<f:param name="DO_ASSIGN_VALIDATION" value="true"/>
9697
</p:commandButton>
9798
<button type="button" class="btn btn-link" onclick="PF('userGroupsForm').hide()">

0 commit comments

Comments
 (0)