|
1 | 1 | package edu.harvard.iq.dataverse.engine.command.impl; |
2 | 2 |
|
3 | | -import edu.harvard.iq.dataverse.Dataset; |
4 | | -import edu.harvard.iq.dataverse.DatasetVersion; |
5 | | -import edu.harvard.iq.dataverse.GlobalId; |
6 | | -import edu.harvard.iq.dataverse.RoleAssignment; |
7 | | -import edu.harvard.iq.dataverse.Template; |
8 | | -import edu.harvard.iq.dataverse.UserNotification; |
| 3 | +import edu.harvard.iq.dataverse.*; |
9 | 4 | import edu.harvard.iq.dataverse.authorization.Permission; |
10 | 5 | import edu.harvard.iq.dataverse.authorization.users.AuthenticatedUser; |
11 | 6 | import edu.harvard.iq.dataverse.authorization.users.User; |
12 | 7 | import edu.harvard.iq.dataverse.engine.command.CommandContext; |
13 | 8 | import edu.harvard.iq.dataverse.engine.command.DataverseRequest; |
| 9 | +import edu.harvard.iq.dataverse.engine.command.RequiredPermissions; |
14 | 10 | import edu.harvard.iq.dataverse.engine.command.exception.CommandException; |
15 | 11 | import edu.harvard.iq.dataverse.engine.command.exception.IllegalCommandException; |
16 | 12 | import edu.harvard.iq.dataverse.pidproviders.PidProvider; |
17 | 13 | import edu.harvard.iq.dataverse.pidproviders.PidUtil; |
18 | 14 | import edu.harvard.iq.dataverse.settings.SettingsServiceBean; |
19 | 15 |
|
20 | | -import static edu.harvard.iq.dataverse.util.StringUtil.nonEmpty; |
21 | | - |
22 | | -import edu.harvard.iq.dataverse.engine.command.RequiredPermissions; |
23 | | -import java.util.List; |
24 | 16 | import java.sql.Timestamp; |
25 | 17 | import java.time.Instant; |
26 | 18 |
|
| 19 | +import static edu.harvard.iq.dataverse.util.StringUtil.nonEmpty; |
| 20 | + |
27 | 21 | /** |
28 | 22 | * Creates a new {@link Dataset}, used to store unpublished data. This is as opposed to |
29 | 23 | * a harvested or imported datasets, which may contain data that was already published |
@@ -64,7 +58,7 @@ public CreateNewDatasetCommand(Dataset theDataset, DataverseRequest aRequest, Te |
64 | 58 |
|
65 | 59 | public CreateNewDatasetCommand(Dataset theDataset, DataverseRequest aRequest, Template template, boolean validate) { |
66 | 60 | super(theDataset, aRequest, false, validate); |
67 | | - this.template = template; |
| 61 | + this.template = template != null ? template : theDataset.getTemplate(); |
68 | 62 | } |
69 | 63 |
|
70 | 64 | /** |
|
0 commit comments