Skip to content

Commit

Permalink
Reverted p:autoUpdate changes in previous commit. [ref #4780]
Browse files Browse the repository at this point in the history
  • Loading branch information
mheppler committed Jun 28, 2018
1 parent 1b3a4f2 commit 98b2431
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
3 changes: 1 addition & 2 deletions src/main/webapp/dataverse.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@
</div>
</div>
<div class="form-group clearfix">
<p:fragment>
<p:autoUpdate/>
<p:fragment autoUpdate="true">
<label class="col-sm-3 control-label" for="contactEmail">
<span data-toggle="tooltip" data-placement="auto right" class="tooltiplabel text-info" data-original-title="#{bundle['dataverse.email.title']}">
#{bundle['dataverse.email']} <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
Expand Down
6 changes: 2 additions & 4 deletions src/main/webapp/metadataFragment.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@
<h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" rendered="#{dsf.required or dsf.datasetFieldType.hasRequiredChildren }" />
</label>
<!-- Primitive fields -->
<p:fragment rendered="#{dsf.datasetFieldType.primitive}">
<p:autoUpdate/>
<p:fragment autoUpdate="true" rendered="#{dsf.datasetFieldType.primitive}">
<div class="form-group">
<ui:remove><!-- There is an issue with the dynamic +/- and the primefaces autoupdate where they are not working
well together for the primitive fields, but are for the compound fields. So as a workaround for the primitive,
Expand Down Expand Up @@ -161,8 +160,7 @@
</div>
</p:fragment>
<!-- Compound fields -->
<p:fragment rendered="#{dsf.datasetFieldType.compound}">
<p:autoUpdate/>
<p:fragment autoUpdate="true" rendered="#{dsf.datasetFieldType.compound}">
<div class="form-group form-col-container col-sm-9 dataset-field-values">
<ui:repeat value="#{dsf.datasetFieldCompoundValues}" var="compoundValue" varStatus="valCount">
<div class="form-group form-col-container col-sm-9 edit-compound-field">
Expand Down
3 changes: 1 addition & 2 deletions src/main/webapp/themeAndWidgetsFragment.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<!-- Theme and Widgets Edit Tabs -->
<p:tabView rendered="#{themeWidgetFragment.editDv!=null}" id="themeWidgetsTabView" widgetVar="content">
<p:tab id="themeTab" title="#{bundle['dataverse.theme.title']}" rendered="#{not settingsWrapper.rootDataverseThemeDisabled or themeWidgetFragment.editDv.owner != null}">
<p:fragment>
<p:autoUpdate/>
<p:fragment autoUpdate="true">
<!-- Dataverse Theme Panel -->
<div class="row form-horizontal">
<div class="form-group" jsf:rendered="#{themeWidgetFragment.editDv.owner!=null}">
Expand Down

0 comments on commit 98b2431

Please sign in to comment.