Skip to content

The Unified and Autonomous Development Platform

Fix issue #381 - Error on reconcilliation after renaming status fields

Robin Shend4bfcc583f74
diff --git a/pom.xml b/pom.xml
index b7dcae98ef..d1e3cb0c9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<version>1.0.5</version>
</parent>
<artifactId>server</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
<packaging>pom</packaging>
<build>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
diff --git a/server-core/pom.xml b/server-core/pom.xml
index 2a4a92e9bc..2b7a5670ec 100644
--- a/server-core/pom.xml
+++ b/server-core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<build>
<plugins>
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index 3a60f8a199..ac82442fcb 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -547,7 +547,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
public Collection<String> getUndefinedIssueFields() {
Collection<String> undefinedFields = new HashSet<>();
undefinedFields.addAll(getIssueSetting().getUndefinedFields());
- undefinedFields.addAll(getServiceDeskSetting().getUndefinedIssueFields());
+ if (getServiceDeskSetting() != null)
+ undefinedFields.addAll(getServiceDeskSetting().getUndefinedIssueFields());
return undefinedFields;
}
@@ -555,7 +556,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
public Collection<UndefinedFieldValue> getUndefinedIssueFieldValues() {
Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
undefinedFieldValues.addAll(getIssueSetting().getUndefinedFieldValues());
- undefinedFieldValues.addAll(getServiceDeskSetting().getUndefinedIssueFieldValues());
+ if (getServiceDeskSetting() != null)
+ undefinedFieldValues.addAll(getServiceDeskSetting().getUndefinedIssueFieldValues());
return undefinedFieldValues;
}
@@ -563,7 +565,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
public Collection<String> fixUndefinedIssueFields(Map<String, UndefinedFieldResolution> resolutions) {
Collection<String> deletedFields = new HashSet<>();
deletedFields.addAll(getIssueSetting().fixUndefinedFields(resolutions));
- getServiceDeskSetting().fixUndefinedIssueFields(resolutions);
+ if (getServiceDeskSetting() != null)
+ getServiceDeskSetting().fixUndefinedIssueFields(resolutions);
return deletedFields;
}
@@ -571,14 +574,16 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
public Collection<String> fixUndefinedIssueFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {
Collection<String> deletedFields = new HashSet<>();
deletedFields.addAll(getIssueSetting().fixUndefinedFieldValues(resolutions));
- getServiceDeskSetting().fixUndefinedIssueFieldValues(resolutions);
+ if (getServiceDeskSetting() != null)
+ getServiceDeskSetting().fixUndefinedIssueFieldValues(resolutions);
return deletedFields;
}
@Override
public void onRenameRole(String oldName, String newName) {
getIssueSetting().onRenameRole(oldName, newName);
- getServiceDeskSetting().onRenameRole(oldName, newName);
+ if (getServiceDeskSetting() != null)
+ getServiceDeskSetting().onRenameRole(oldName, newName);
}
@Override
@@ -586,7 +591,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
Usage usage = new Usage();
usage.add(getIssueSetting().onDeleteRole(roleName));
- usage.add(getServiceDeskSetting().onDeleteRole(roleName));
+ if (getServiceDeskSetting() != null)
+ usage.add(getServiceDeskSetting().onDeleteRole(roleName));
return usage.prefix("administration");
}
@@ -597,7 +603,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
jobExecutor.onRenameProject(oldName, newName);
for (GroovyScript groovyScript: getGroovyScripts())
groovyScript.onRenameProject(oldName, newName);
- getServiceDeskSetting().onRenameProject(oldName, newName);
+ if (getServiceDeskSetting() != null)
+ getServiceDeskSetting().onRenameProject(oldName, newName);
}
@Override
@@ -614,7 +621,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
usage.add(groovyScript.onDeleteProject(projectName).prefix("groovy script #" + index));
index++;
}
- usage.add(getServiceDeskSetting().onDeleteProject(projectName));
+ if (getServiceDeskSetting() != null)
+ usage.add(getServiceDeskSetting().onDeleteProject(projectName));
return usage.prefix("administration");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html
index 0ef45cad63..ace47c83c7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html
@@ -1,3 +1,6 @@
<wicket:panel>
- <div class="alert alert-notice alert-light-warning shadow">Issue workflow changed, <a wicket:id="reconcile" class="link-primary">reconciliation</a> needs to be performed to make data consistent</div>
+ <div class="alert alert-notice alert-light-warning shadow">
+ Issue workflow changed, <a wicket:id="reconcile" class="link-primary">reconciliation</a> needs to be performed
+ to make data consistent. You may do this after making all necessary changes
+ </div>
</wicket:panel>
diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml
index 6f4f382059..ce39897270 100644
--- a/server-plugin/pom.xml
+++ b/server-plugin/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xml
index 0e093391ed..eecfedcec9 100644
--- a/server-plugin/server-plugin-archetype/pom.xml
+++ b/server-plugin/server-plugin-archetype/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<build>
<resources>
diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xml
index 60105518c9..a8d8e12845 100644
--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml
+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xml
index 3e151eba39..b607c86310 100644
--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml
+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xml
index 9dae5bc1ba..e68dbb08f7 100644
--- a/server-plugin/server-plugin-buildspec-maven/pom.xml
+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xml
index 14e3cdc433..acf31290b7 100644
--- a/server-plugin/server-plugin-buildspec-node/pom.xml
+++ b/server-plugin/server-plugin-buildspec-node/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-docker/pom.xml b/server-plugin/server-plugin-executor-docker/pom.xml
index 3e4da4d1eb..3bbc950bb1 100644
--- a/server-plugin/server-plugin-executor-docker/pom.xml
+++ b/server-plugin/server-plugin-executor-docker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.docker.DockerModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xml
index 5529c0b87d..bc7bf1e2cf 100644
--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml
+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
index 5c29e5023c..612e47fa3e 100644
--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xml
index d319fd56d3..2409a73ea2 100644
--- a/server-plugin/server-plugin-import-gitea/pom.xml
+++ b/server-plugin/server-plugin-import-gitea/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitea.GiteaPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xml
index c25b042129..c3d8f7bd4e 100644
--- a/server-plugin/server-plugin-import-github/pom.xml
+++ b/server-plugin/server-plugin-import-github/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.github.GitHubPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xml
index a9fb14f576..d21dc6fc30 100644
--- a/server-plugin/server-plugin-import-gitlab/pom.xml
+++ b/server-plugin/server-plugin-import-gitlab/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xml
index 745d4be4d5..62f0f65a87 100644
--- a/server-plugin/server-plugin-import-jiracloud/pom.xml
+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xml
index 73894a1496..6906fc37ba 100644
--- a/server-plugin/server-plugin-import-youtrack/pom.xml
+++ b/server-plugin/server-plugin-import-youtrack/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xml
index 2261d08a71..539eb42297 100644
--- a/server-plugin/server-plugin-report-checkstyle/pom.xml
+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.checkstyle.CheckstylePluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xml
index 78ce87ded8..23f982eb18 100644
--- a/server-plugin/server-plugin-report-clover/pom.xml
+++ b/server-plugin/server-plugin-report-clover/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.clover.CloverPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xml
index 467f5553bf..47e9fdfb67 100644
--- a/server-plugin/server-plugin-report-jest/pom.xml
+++ b/server-plugin/server-plugin-report-jest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.jest.JestTestReportModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xml
index 04b9f4bb3d..cb37ce7194 100644
--- a/server-plugin/server-plugin-report-markdown/pom.xml
+++ b/server-plugin/server-plugin-report-markdown/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>
diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xml
index 1a28588879..b0128755ec 100644
--- a/server-plugin/server-plugin-sso-openid/pom.xml
+++ b/server-plugin/server-plugin-sso-openid/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-product/pom.xml b/server-product/pom.xml
index 9718376f80..70e257dfc8 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>4.9.0</version>
+ <version>4.9.1</version>
</parent>
<dependencies>
<dependency>