Skip to content

The Unified and Autonomous Development Platform

Fix issue #859 - [Helpdesk] Can't add (required) issue creation settings

Robin Shenb2258a9b3ab0
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/GmailSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/GmailSetting.java
index f5d50199d3..65b8ef6c97 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/GmailSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/GmailSetting.java
@@ -59,8 +59,9 @@ public class GmailSetting extends MailSetting {
this.clientSecret = clientSecret;
}
- @Editable(order=300, description="Specify account name to login to Gmail to send/receive emails. "
- + "This should be a Gmail address")
+ @Editable(order=300, description="Specify account name to login to Gmail. This should be a Gmail address, and "
+ + "will be taken as system email address, whose inbox will be checked to post various comments from "
+ + "email if <code>Check Incoming Email</code> option is enabled below")
@Email
@NotEmpty
public String getAccountName() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/Office365Setting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/Office365Setting.java
index 08910d0924..6dfc11fa89 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/Office365Setting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/Office365Setting.java
@@ -96,9 +96,9 @@ public class Office365Setting extends MailSetting {
this.refreshToken = refreshToken;
}
- @Editable(order=410, description="Primary or alias email address of above account to be used as sender address "
- + "of various notifications. Emails targeting this address will also be checked to post various "
- + "comments if <code>Check Incoming Email</code> option is enabled below")
+ @Editable(order=410, name="System Email Address", description="Primary or alias email address of above account "
+ + "to be used as sender address of various notifications. Emails targeting this address will also be "
+ + "checked to post various comments if <code>Check Incoming Email</code> option is enabled below")
@Email
@NotEmpty
public String getEmailAddress() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java
index 44c9facd5a..ab8d584638 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/mailsetting/OtherMailSetting.java
@@ -67,9 +67,9 @@ public class OtherMailSetting extends MailSetting {
this.smtpPassword = smtpPassword;
}
- @Editable(order=410, description="This address will be used as sender address of various notifications. "
- + "Emails targeting this address and its sub addressing in the IMAP inbox will also be checked if "
- + "<code>Check Incoming Email</code> option is enabled below")
+ @Editable(order=410, name="System Email Address", description="This address will be used as sender address of "
+ + "various notifications. Emails targeting this address and its sub addressing in the IMAP inbox will "
+ + "also be checked if <code>Check Incoming Email</code> option is enabled below")
@Email
@NotEmpty
public String getEmailAddress() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.java
index bd089c2814..355e2be6a2 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneMultiChoiceEditor.java
@@ -50,11 +50,11 @@ public class MilestoneMultiChoiceEditor extends PropertyEditor<List<String>> {
if (milestoneChoice.value().length() != 0) {
choices.addAll((List<Milestone>)ReflectionUtils
.invokeStaticMethod(descriptor.getBeanClass(), milestoneChoice.value()));
- } else {
+ } else if (Project.get() != null) {
choices.addAll(Project.get().getSortedHierarchyMilestones());
}
- if (getModelObject() != null) {
+ if (getModelObject() != null && Project.get() != null) {
MilestoneManager milestoneManager = OneDev.getInstance(MilestoneManager.class);
for (String milestoneName: getModelObject()) {
Milestone milestone = milestoneManager.findInHierarchy(Project.get(), milestoneName);
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneSingleChoiceEditor.java
index 4fdc1fd585..e6f9cdac1b 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/milestonechoice/MilestoneSingleChoiceEditor.java
@@ -46,11 +46,11 @@ public class MilestoneSingleChoiceEditor extends PropertyEditor<String> {
if (milestoneChoice.value().length() != 0) {
choices.addAll((List<Milestone>)ReflectionUtils
.invokeStaticMethod(descriptor.getBeanClass(), milestoneChoice.value()));
- } else {
+ } else if (Project.get() != null) {
choices.addAll(Project.get().getSortedHierarchyMilestones());
}
- if (getModelObject() != null)
+ if (Project.get() != null && getModelObject() != null)
selection = Project.get().getHierarchyMilestone(getModelObject());
else
selection = null;