From 4f131f03b301eeef2eb91fe9b81e10a7c87f74bd Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Mon, 12 Jun 2017 14:27:14 -0400
Subject: [PATCH] dataverse name initial text should be real, not watermark
 #3611

---
 src/main/java/edu/harvard/iq/dataverse/DataversePage.java | 6 +++---
 src/main/webapp/dataverse.xhtml                           | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
index bb7a1e50497..c10bc5724a0 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataversePage.java
@@ -303,6 +303,9 @@ public String init() {
             dataverse.setAffiliation(session.getUser().getDisplayInfo().getAffiliation());
             setupForGeneralInfoEdit();
             // FacesContext.getCurrentInstance().addMessage(null, new FacesMessage(FacesMessage.SEVERITY_INFO, "Create New Dataverse", " - Create a new dataverse that will be a child dataverse of the parent you clicked from. Asterisks indicate required fields."));
+            if (dataverse.getName() == null) {
+                dataverse.setName(DataverseUtil.getSuggestedDataverseNameOnCreate(session.getUser()));
+            }
         }
 
         return null;
@@ -1014,7 +1017,4 @@ public void validateAlias(FacesContext context, UIComponent toValidate, Object v
         }
     }
 
-    public String getSuggestedDataverseNameOnCreate() {
-        return DataverseUtil.getSuggestedDataverseNameOnCreate(session.getUser());
-    }
 }
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 8734213d7c9..48f96328a10 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -58,7 +58,6 @@
                                 </label>
                                 <div class="col-sm-9 form-col-container">
                                     <p:inputText id="name" tabindex="1" styleClass="form-control" value="#{DataversePage.dataverse.name}"/>
-                                    <p:watermark for="name" value="#{DataversePage.suggestedDataverseNameOnCreate}"/>
                                 </div>
                             </div>
                             <div class="col-xs-6 form-group form-col-container">