Merge pull request #11700 from IQSS/11698-6.7.1-hotfix

Revert #11301 and bump version to 6.7.1

Author: ofahimIQSS

doc/sphinx-guides/source/conf.py

@@ -70,7 +70,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '6.7'
+version = '6.7.1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

doc/sphinx-guides/source/versions.rst

@@ -8,6 +8,7 @@ This list provides a way to refer to the documentation for previous and future v
 
 - pre-release `HTML (not final!) <http://preview.guides.gdcc.io/en/develop/>`__ and `PDF (experimental!) <http://preview.guides.gdcc.io/_/downloads/en/develop/pdf/>`__ built from the :doc:`develop </developers/version-control>` branch :doc:`(how to contribute!) </contributor/documentation>`
 - |version|
+- `6.7 </en/6.7/>`__
 - `6.6 </en/6.6/>`__
 - `6.5 </en/6.5/>`__
 - `6.4 </en/6.4/>`__

modules/dataverse-parent/pom.xml

@@ -132,7 +132,7 @@
 
     <properties>
         <!-- This is a special Maven property name, do not change! -->
-        <revision>6.7</revision>
+        <revision>6.7.1</revision>
 
         <target.java.version>17</target.java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -454,8 +454,8 @@
                     Once the release has been made (tag created), change this back to "${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}"
                     (These properties are provided by the build-helper plugin below.)
                 -->
-                <!--<base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>-->
-                <base.image.version>${revision}</base.image.version>
+                <base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>
+                <!--<base.image.version>${revision}</base.image.version>-->
                 <!-- This is used by the maintenance CI jobs, no need to adapt during releases. -->
                 <app.image.version>${base.image.version}</app.image.version>
             </properties>

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

@@ -331,7 +331,6 @@ public enum DisplayMode {
     private List<SelectItem> linkingDVSelectItems;
     private Dataverse linkingDataverse;
     private Dataverse selectedHostDataverse;
-    private boolean hasDataversesToChoose;
 
     public Dataverse getSelectedHostDataverse() {
         return selectedHostDataverse;
@@ -1773,11 +1772,6 @@ public void setDataverseTemplates(List<Template> dataverseTemplates) {
         this.dataverseTemplates = dataverseTemplates;
     }
 
-    public boolean isHasDataversesToChoose() {
-        this.hasDataversesToChoose = dataverseService.findAll().size() > 1;
-        return this.hasDataversesToChoose;
-    }
-
     public Template getDefaultTemplate() {
         return defaultTemplate;
     }

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

@@ -13,29 +13,19 @@
 import jakarta.faces.convert.Converter;
 import jakarta.faces.convert.FacesConverter;
 
-import java.util.logging.Logger;
-
 /**
  *
  * @author skraffmiller
  */
 @FacesConverter("dataverseConverter")
 public class DataverseConverter implements Converter {
-    private static final Logger logger = Logger.getLogger(DatasetPage.class.getCanonicalName());
-
 
     //@EJB
     DataverseServiceBean dataverseService = CDI.current().select(DataverseServiceBean.class).get();
 
     @Override
     public Object getAsObject(FacesContext facesContext, UIComponent component, String submittedValue) {
-        if (submittedValue == null || !submittedValue.matches("[0-9]+")) {
-            logger.fine("Submitted value is not a host dataverse number but: " + submittedValue);
-            return CDI.current().select(DatasetPage.class).get().getSelectedHostDataverse();
-        }
-        else {
-            return dataverseService.find(Long.valueOf(submittedValue));
-        }
+        return dataverseService.find(new Long(submittedValue));
         //return dataverseService.findByAlias(submittedValue);
     }
 

src/main/webapp/dataset.xhtml

@@ -753,7 +753,7 @@
                     <!-- Create/Edit editMode -->
                     <ui:fragment rendered="#{DatasetPage.editMode == 'METADATA' or DatasetPage.editMode == 'CREATE'}">
                         <p:focus context="datasetForm"/>
-                        <div class="form-group" jsf:rendered="#{DatasetPage.hasDataversesToChoose and DatasetPage.editMode == 'CREATE'}">
+                        <div class="form-group">
                             <label jsf:for="#{DatasetPage.editMode == 'CREATE' ? 'selectHostDataverse_input' : 'select_HostDataverse_Static'}" class="col-md-3 control-label">
                                 #{bundle.hostDataverse}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"