Skip to content

Commit 8f58f19

Browse files
qqmyersqqmyers
committed
make updating RA history conditional on flag being set.
1 parent 7c0f26b commit 8f58f19

2 files changed

Lines changed: 14 additions & 10 deletions

File tree

‎src/main/webapp/permissions-manage-files.xhtml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<ui:param name="dataset" value="#{manageFilePermissionsPage.dataset}"/>
2424
<ui:param name="version" value="#{manageFilePermissionsPage.dataset.latestVersion}"/>
2525
<ui:param name="showMessagePanel" value="false"/>
26+
<o:importConstants type="edu.harvard.iq.dataverse.settings.FeatureFlags" />
27+
<ui:param name="RAAuditingEnabled" value="#{FeatureFlags.ROLE_ASSIGNMENT_AUDITING.enabled()}" />
2628
<ui:define name="body">
2729
<h:form id="rolesPermissionsForm" styleClass="margin-top">
2830
<div class="panel-group">
@@ -95,15 +97,15 @@
9597
update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)}
9698
:#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)}
9799
#{p:resolveClientId('rolesPermissionsForm:usersGroups', view)}
98-
roleAssignmentHistory @([id$=Messages])">
100+
@if(#{RAAuditingEnabled}) roleAssignmentHistory @([id$=Messages])">
99101
<span class="glyphicon glyphicon-ok"/> #{bundle['dataverse.permissionsFiles.assignDialog.grantBtn']}
100102
</p:commandLink>
101103
<p:commandLink styleClass="btn btn-default"
102104
actionListener="#{manageFilePermissionsPage.rejectAccessToAllRequests(access.key)}"
103105
update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)}
104106
:#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)}
105107
#{p:resolveClientId('rolesPermissionsForm:usersGroups', view)}
106-
roleAssignmentHistory @([id$=Messages])">
108+
@if(#{RAAuditingEnabled}) roleAssignmentHistory @([id$=Messages])">
107109
<span class="glyphicon glyphicon-ban-circle"/> #{bundle['dataverse.permissionsFiles.assignDialog.rejectBtn']}
108110
</p:commandLink>
109111
</div>
@@ -219,8 +221,8 @@
219221
</div>
220222
</div>
221223
<!-- Role Assignment History Panel -->
222-
<o:importConstants type="edu.harvard.iq.dataverse.settings.FeatureFlags" />
223-
<div class="panel panel-default" rendered="#{FeatureFlags.ROLE_ASSIGNMENT_AUDITING.enabled()}">
224+
225+
<div class="panel panel-default" rendered="#{RAAuditingEnabled}">
224226
<div data-toggle="collapse" data-target="#panelCollapseHistory" class="panel-heading text-info">
225227
#{bundle['dataverse.permissions.history']} <span class="glyphicon glyphicon-chevron-down" /> <span class="text-muted small pull-right">#{bundle['dataverse.permissions.history.description']}</span>
226228
</div>
@@ -383,14 +385,14 @@
383385
</div>
384386
<div class="button-block">
385387
<p:commandLink styleClass="btn btn-default" rendered="#{empty manageFilePermissionsPage.fileRequester}"
386-
update="assignRoleContent userGroups restrictedFiles roleAssignmentHistory @([id$=Messages])"
388+
update="assignRoleContent userGroups restrictedFiles @if(#{RAAuditingEnabled}) roleAssignmentHistory @([id$=Messages])"
387389
actionListener="#{manageFilePermissionsPage.grantAccess}" oncomplete="if (args &amp;&amp; !args.validationFailed) PF('assignWidget').hide();">
388390
<f:param name="DO_VALIDATION" value="true"/>
389391
<span class="glyphicon glyphicon-ok"/>
390392
<h:outputText value="#{bundle['dataverse.permissionsFiles.assignDialog.grantBtn']}"/>
391393
</p:commandLink>
392394
<p:commandLink styleClass="btn btn-default" rendered="#{!empty manageFilePermissionsPage.fileRequester}"
393-
update="assignRoleContent userGroups fileAccessRequests restrictedFiles roleAssignmentHistory @([id$=Messages])"
395+
update="assignRoleContent userGroups fileAccessRequests restrictedFiles @if(#{RAAuditingEnabled}) roleAssignmentHistory @([id$=Messages])"
394396
actionListener="#{manageFilePermissionsPage.grantAccessToRequests(manageFilePermissionsPage.fileRequester)}" oncomplete="PF('assignWidget').hide();">
395397
<span class="glyphicon glyphicon-ok"/>
396398
<h:outputText value="#{bundle['dataverse.permissionsFiles.assignDialog.grantBtn']}"/>
@@ -415,7 +417,7 @@
415417
<p:commandButton styleClass="btn btn-default" value="#{bundle.continue}" onclick="PF('confirmation').hide()"
416418
action="#{manageFilePermissionsPage.removeRoleAssignments()}"
417419
process="@this"
418-
update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} roleAssignmentHistory @([id$=Messages])"
420+
update=":#{p:resolveClientId('rolesPermissionsForm:userGroups', view)} :#{p:resolveClientId('rolesPermissionsForm:restrictedFiles', view)} @if(#{RAAuditingEnabled}) roleAssignmentHistory @([id$=Messages])"
419421
oncomplete="PF('viewRemoveWidget').hide();"/>
420422
<button class="btn btn-link" onclick="PF('confirmation').hide();" type="button">
421423
#{bundle.cancel}

‎src/main/webapp/permissions-manage.xhtml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<ui:param name="dataset" value="#{managePermissionsPage.dvObject.instanceofDataset ? managePermissionsPage.dvObject : null}"/>
2424
<ui:param name="version" value="#{managePermissionsPage.dvObject.instanceofDataset ? managePermissionsPage.dvObject.latestVersion : null}"/>
2525
<ui:param name="showMessagePanel" value="false"/>
26+
<o:importConstants type="edu.harvard.iq.dataverse.settings.FeatureFlags" />
27+
<ui:param name="RAAuditingEnabled" value="#{FeatureFlags.ROLE_ASSIGNMENT_AUDITING.enabled()}" />
2628
<ui:define name="body">
2729
<h:form id="rolesPermissionsForm" styleClass="margin-top">
2830
<div class="panel-group">
@@ -105,7 +107,7 @@
105107
<div class="margin-bottom text-right">
106108
<p:commandLink id="userGroupsAdd" styleClass="btn btn-default"
107109
actionListener="#{managePermissionsPage.initAssigneeDialog}"
108-
update="userGroupDialog roleAssignmentHistory"
110+
update="userGroupDialog @if(#{RAAuditingEnabled}) roleAssignmentHistory"
109111
oncomplete="PF('userGroupsForm').show();handleResizeDialog('userGroupDialog');">
110112
<span class="glyphicon glyphicon-user"/> #{bundle['dataverse.permissions.usersOrGroups.assignBtn']}
111113
</p:commandLink>
@@ -199,7 +201,7 @@
199201
</div>
200202
</div>
201203
<!-- Role Assignment History Panel -->
202-
<o:importConstants type="edu.harvard.iq.dataverse.settings.FeatureFlags" />
204+
203205
<div class="panel panel-default" rendered="#{FeatureFlags.ROLE_ASSIGNMENT_AUDITING.enabled()}">
204206
<div data-toggle="collapse" data-target="#panelCollapseHistory" class="panel-heading text-info">
205207
#{bundle['dataverse.permissions.history']} <span class="glyphicon glyphicon-chevron-down" /> <span class="text-muted small pull-right">#{bundle['dataverse.permissions.history.description']}</span>
@@ -268,7 +270,7 @@
268270
<div class="button-block">
269271
<p:commandButton value="#{bundle.continue}" styleClass="btn btn-default" onclick="PF('confirmation').hide()"
270272
action="#{managePermissionsPage.removeRoleAssignment()}"
271-
update=":#{p:resolveClientId('rolesPermissionsForm:configureSettings', view)} assignedRoles roleAssignmentHistory @([id$=Messages])" />
273+
update=":#{p:resolveClientId('rolesPermissionsForm:configureSettings', view)} assignedRoles @if(#{RAAuditingEnabled}) roleAssignmentHistory @([id$=Messages])" />
272274
<button class="btn btn-link" onclick="PF('confirmation').hide()" type="button">
273275
#{bundle.cancel}
274276
</button>

0 commit comments

Comments
 (0)
⚡