Skip to content

Commit

Permalink
#4610 backing out autoupdate changes
Browse files Browse the repository at this point in the history
  • Loading branch information
sekmiller committed Jul 17, 2018
1 parent b5f81e3 commit e4a6eed
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions src/main/webapp/dataverse.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
</div>
</div>
<div class="form-group clearfix">
<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 Expand Up @@ -165,7 +165,7 @@
</div>
</ui:repeat>
</div>
</p:autoUpdate>
</p:fragment>
</div>
</div>
<div class="col-xs-6 form-group form-col-container">
Expand Down
8 changes: 4 additions & 4 deletions src/main/webapp/metadataFragment.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<h:outputText styleClass="glyphicon glyphicon-asterisk text-danger" value="" rendered="#{dsf.required or dsf.datasetFieldType.hasRequiredChildren }" />
</label>
<!-- Primitive fields -->
<p:autoUpdate rendered="#{dsf.datasetFieldType.primitive}">
<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 @@ -158,9 +158,9 @@
</div>
</ui:repeat>
</div>
</p:autoUpdate>
</p:fragment>
<!-- Compound fields -->
<p:autoUpdate rendered="#{dsf.datasetFieldType.compound}">
<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 Expand Up @@ -222,7 +222,7 @@
</div>
</ui:repeat>
</div>
</p:autoUpdate>
</p:fragment>
</div>
</ui:fragment>
</ui:repeat>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/themeAndWidgetsFragment.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +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: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 Expand Up @@ -178,7 +178,7 @@
</div>
</div>
</ui:fragment>
</p:autoUpdate>
</p:fragment>
<div class="button-block">
<p:commandButton class="btn btn-default" value="#{bundle.saveChanges}" update=":#{p:resolveClientId('messagePanel', view)}, :themeWidgetsForm" action="#{themeWidgetFragment.save()}" oncomplete="bind_bsui_components();"/>
<p:commandButton class="btn btn-default" action="#{themeWidgetFragment.cancel()}" immediate="true" id="themeCancel" value="#{bundle.cancel}"/>
Expand Down

0 comments on commit e4a6eed

Please sign in to comment.