Skip to content

Commit abc6d7c

Browse files
authored
Merge pull request #12052 from GlobalDataverseCommunityConsortium/Fix_role_assignment_history_panel
Fix Role Assignement History Panel showing when feature is off
2 parents b20164a + d1f9cb9 commit abc6d7c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
</div>
222222
<!-- Role Assignment History Panel -->
223223
<o:importConstants type="edu.harvard.iq.dataverse.settings.FeatureFlags" />
224-
<div class="panel panel-default" rendered="#{FeatureFlags.ROLE_ASSIGNMENT_HISTORY.enabled()}">
224+
<div class="panel panel-default" jsf:rendered="#{FeatureFlags.ROLE_ASSIGNMENT_HISTORY.enabled()}">
225225
<div data-toggle="collapse" data-target="#panelCollapseHistory" class="panel-heading text-info">
226226
#{bundle['dataverse.permissions.history']} <span class="glyphicon glyphicon-chevron-down" /> <span class="text-muted small pull-right">#{bundle['dataverse.permissions.history.description']}</span>
227227
</div>

src/main/webapp/permissions-manage.xhtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
xmlns:ui="http://java.sun.com/jsf/facelets"
66
xmlns:p="http://primefaces.org/ui"
77
xmlns:c="http://java.sun.com/jsp/jstl/core"
8+
xmlns:jsf="http://xmlns.jcp.org/jsf"
89
xmlns:o="http://omnifaces.org/ui"
910
xmlns:iqbs="http://xmlns.jcp.org/jsf/composite/iqbs">
1011

@@ -198,7 +199,7 @@
198199
</div>
199200
<!-- Role Assignment History Panel -->
200201
<o:importConstants type="edu.harvard.iq.dataverse.settings.FeatureFlags" />
201-
<div class="panel panel-default" rendered="#{FeatureFlags.ROLE_ASSIGNMENT_HISTORY.enabled()}">
202+
<div class="panel panel-default" jsf:rendered="#{FeatureFlags.ROLE_ASSIGNMENT_HISTORY.enabled()}">
202203
<div data-toggle="collapse" data-target="#panelCollapseHistory" class="panel-heading text-info">
203204
#{bundle['dataverse.permissions.history']} <span class="glyphicon glyphicon-chevron-down" /> <span class="text-muted small pull-right">#{bundle['dataverse.permissions.history.description']}</span>
204205
</div>

0 commit comments

Comments
 (0)