Merge pull request #4211 from IQSS/4198-default-theme-inheritance

New dataverse should use the default theme on create screen #4189
IQSS · Oct 19, 2017 · 6b53fa1 · 6b53fa1
2 parents 509f8b3 + bcbc5cc
commit 6b53fa1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -162,7 +162,8 @@ public void setDefaultContributorRole(DataverseRole defaultContributorRole) {
 
     private boolean metadataBlockRoot;
     private boolean facetRoot;
-    private boolean themeRoot;
+    // By default, themeRoot should be true, as new dataverses should start with the default theme
+    private boolean themeRoot = true;
     private boolean templateRoot;    
 
 

diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/CreateDataverseCommand.java
@@ -78,8 +78,6 @@ public Dataverse execute(CommandContext ctxt) throws CommandException {
             created.setDefaultContributorRole(ctxt.roles().findBuiltinRoleByAlias(DataverseRole.EDITOR));
         }
 
-        // By default, themeRoot should be true
-        created.setThemeRoot(true);
         // @todo for now we are saying all dataverses are permission root
         created.setPermissionRoot(true);