archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Add data migration logic

Browse Source
This commit is contained in:
robin shen 2019-12-18 11:29:43 +08:00
parent 774ced95ad
commit 243359dbc5
6 changed files with 1324 additions and 1316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2608
server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
View File

File diff suppressed because it is too large Load Diff

8
server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java
View File

@ -31,7 +31,7 @@ public class ProjectBuildSetting implements Serializable {
private List<BuildPreservation> buildPreservations = new ArrayList<>();
private transient GlobalBuildSetting setting;
private transient GlobalBuildSetting globalSetting;
public List<JobSecret> getSecrets() {
return secrets;
@ -50,9 +50,9 @@ public class ProjectBuildSetting implements Serializable {
}
private GlobalBuildSetting getGlobalSetting() {
if (setting == null)
setting = OneDev.getInstance(SettingManager.class).getBuildSetting();
return setting;
if (globalSetting == null)
globalSetting = OneDev.getInstance(SettingManager.class).getBuildSetting();
return globalSetting;
}
@Nullable

2
server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.html
View File

@ -13,12 +13,10 @@
</form>
</div>
</div>
<wicket:enclosure child="inheritedBuildPreservations">
<div class="panel panel-default">
<div class="panel-heading"><b>Inherited from Owner</b></div>
<div class="panel-body">
<div wicket:id="inheritedBuildPreservations"></div>
</div>
</div>
</wicket:enclosure>
</wicket:extend>

9
server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreserveRulesPage.java
View File

@ -1,17 +1,14 @@
package io.onedev.server.web.page.project.setting.build;
import java.io.Serializable;
import java.util.List;
import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.support.BuildPreservation;
import io.onedev.server.web.editable.PropertyContext;
@SuppressWarnings("serial")
@ -25,11 +22,7 @@ public class ProjectBuildPreserveRulesPage extends ProjectBuildSettingPage {
protected void onInitialize() {
super.onInitialize();
List<BuildPreservation> inheritedBuildPreservations = getProject().getOwner().getBuildSetting().getBuildPreservations();
if (!inheritedBuildPreservations.isEmpty())
add(PropertyContext.view("inheritedBuildPreservations", getProject().getOwner().getBuildSetting(), "buildPreservations"));
else
add(new WebMarkupContainer("inheritedBuildPreservations").setVisible(false));
add(PropertyContext.view("inheritedBuildPreservations", getProject().getOwner().getBuildSetting(), "buildPreservations"));
Form<?> form = new Form<Void>("form") {

2
server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.html
View File

@ -12,12 +12,10 @@
</form>
</div>
</div>
<wicket:enclosure child="inheritedSecrets">
<div class="panel panel-default">
<div class="panel-heading"><b>Inherited from Owner</b></div>
<div class="panel-body">
<div wicket:id="inheritedSecrets"></div>
</div>
</div>
</wicket:enclosure>
</wicket:extend>

11
server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectSecretListPage.java
View File

@ -6,7 +6,6 @@ import java.util.List;
import java.util.Set;
import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.AbstractReadOnlyModel;
@ -31,13 +30,9 @@ public class ProjectSecretListPage extends ProjectBuildSettingPage {
super.onInitialize();
List<JobSecret> inheritedSecrets = getProject().getBuildSetting().getInheritedSecrets(getProject());
if (!inheritedSecrets.isEmpty()) {
InheritedSecretsBean bean = new InheritedSecretsBean();
bean.setSecrets(inheritedSecrets);
add(PropertyContext.view("inheritedSecrets", bean, "secrets"));
} else {
add(new WebMarkupContainer("inheritedSecrets").setVisible(false));
}
InheritedSecretsBean bean = new InheritedSecretsBean();
bean.setSecrets(inheritedSecrets);
add(PropertyContext.view("inheritedSecrets", bean, "secrets"));
Form<?> form = new Form<Void>("form") {