Skip to content

The Unified and Autonomous Development Platform

chore: add OEM setting

Robin Shenb9453d2fae3f
diff --git a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
index 70e6a20304..6381c9372f 100644
--- a/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
+++ b/server-core/src/main/java/io/onedev/server/commandhandler/Upgrade.java
@@ -897,6 +897,18 @@ public class Upgrade extends AbstractPlugin {
}
}
+ if (oldAppDataVersion < 155) {
+ try {
+ if (new File(upgradeDir, "site/assets/logo.png").exists()) {
+ FileUtils.copyFile(
+ new File(upgradeDir, "site/assets/logo.png"),
+ new File(upgradeDir, "site/assets/logo-dark.png"));
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
try {
File wrapperConfFile = new File(upgradeDir, "conf/wrapper.conf");
String wrapperConf = FileUtils.readFileToString(wrapperConfFile, UTF_8);
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index af1b2a8a78..0d4f0c225d 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -6191,6 +6191,10 @@ public class DataMigrator {
executorElement.addElement("buildWithPV").setText("false");
}
}
+ } else if (key.equals("BRANDING")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null)
+ valueElement.addElement("url").setText("https://onedev.io");
}
}
dom.writeToFile(file, false);
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/BrandingSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/BrandingSetting.java
index b6423b7961..7627fd81a2 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/BrandingSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/BrandingSetting.java
@@ -8,8 +8,12 @@ public class BrandingSetting implements Serializable {
public static final String DEFAULT_NAME = "OneDev";
+ public static final String DEFAULT_URL = "https://onedev.io";
+
private String name = DEFAULT_NAME;
+ private String url = DEFAULT_URL;
+
public String getName() {
return name;
}
@@ -17,5 +21,21 @@ public class BrandingSetting implements Serializable {
public void setName(String name) {
this.name = name;
}
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public static boolean isOEM(String brandName) {
+ return "GitOn".equals(brandName);
+ }
+
+ public boolean isOEM() {
+ return isOEM(getName());
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandSettingEditBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandSettingEditBean.java
index b7bb04f958..6c2689697a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandSettingEditBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandSettingEditBean.java
@@ -2,6 +2,9 @@ package io.onedev.server.web.page.admin.brandingsetting;
import io.onedev.server.annotation.Editable;
import io.onedev.server.annotation.Image;
+import io.onedev.server.annotation.ShowCondition;
+import io.onedev.server.model.support.administration.BrandingSetting;
+import io.onedev.server.util.EditContext;
import javax.validation.constraints.NotEmpty;
import java.io.Serializable;
@@ -11,6 +14,8 @@ public class BrandSettingEditBean implements Serializable {
private String name;
+ private String url;
+
private String logoData;
private String darkLogoData;
@@ -24,7 +29,22 @@ public class BrandSettingEditBean implements Serializable {
public void setName(String name) {
this.name = name;
}
+
+ private static boolean isOEM() {
+ return BrandingSetting.isOEM((String) EditContext.get().getInputValue("name"));
+ }
+
+ @Editable(order=150, description = "Specify url for your brand")
+ @ShowCondition("isOEM")
+ @NotEmpty
+ public String getUrl() {
+ return url;
+ }
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
@Editable(order=200, name="Logo for Light Mode", description = "Upload a 128x128 transparent png file to be used " +
"as logo for light mode")
@Image(accept = "image/png")
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java
index fd20c18eea..f207de135d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/brandingsetting/BrandingSettingPage.java
@@ -82,6 +82,7 @@ public class BrandingSettingPage extends AdministrationPage {
var setting = getSettingManager().getBrandingSetting();
var bean = new BrandSettingEditBean();
bean.setName(setting.getName());
+ bean.setUrl(setting.getUrl());
bean.setLogoData(getLogoData(false));
bean.setDarkLogoData(getLogoData(true));
@@ -90,6 +91,7 @@ public class BrandingSettingPage extends AdministrationPage {
protected void onSubmit() {
super.onSubmit();
setting.setName(bean.getName());
+ setting.setUrl(bean.getUrl());
getSettingManager().saveBrandingSetting(setting);
if (!bean.getLogoData().equals(getDefaultLogoData(false))) {
var bytes = getLogoBytes(bean.getLogoData());
@@ -109,6 +111,7 @@ public class BrandingSettingPage extends AdministrationPage {
@Override
public void onClick() {
setting.setName(BrandingSetting.DEFAULT_NAME);
+ setting.setUrl(BrandingSetting.DEFAULT_URL);
getSettingManager().saveBrandingSetting(setting);
getClusterManager().runOnAllServers(new UpdateLogoTask(null, false));
getClusterManager().runOnAllServers(new UpdateLogoTask(null, true));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index a664a015f8..f8ecf70777 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -15,7 +15,7 @@
</div>
</div>
<div class="sidebar-footer">
- <a wicket:id="productVersion" href="https://onedev.io" target="_blank" class="sidebar-version"></a>
+ <a wicket:id="productVersion" target="_blank" class="sidebar-version"></a>
<a wicket:id="tryEE" href="https://onedev.io/pricing" class="try-ee badge badge-sm" title="Try Enterprise Edition">Try EE</a>
<div class="dropdown sidebar-help">
<a href="#" class="dropdown-toggle no-dropdown-caret" data-toggle="dropdown">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 6e3e63dcd0..800aef2b50 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -11,6 +11,7 @@ import io.onedev.server.entitymanager.AlertManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Alert;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.administration.BrandingSetting;
import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.updatecheck.UpdateCheckManager;
@@ -104,6 +105,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.image.ExternalImage;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
@@ -445,7 +447,12 @@ public abstract class LayoutPage extends BasePage {
});
var version = AppLoader.getProduct().getVersion();
- sidebar.add(new Label("productVersion", "OneDev " + version));
+ var brandingSetting = getSettingManager().getBrandingSetting();
+ if (brandingSetting.isOEM())
+ sidebar.add(new ExternalLink("productVersion", brandingSetting.getUrl(), brandingSetting.getName() + " " + version));
+ else
+ sidebar.add(new ExternalLink("productVersion", BrandingSetting.DEFAULT_URL, BrandingSetting.DEFAULT_NAME + " " + version));
+
sidebar.add(new WebMarkupContainer("tryEE") {
@Override
protected void onConfigure() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html
index 83ee56ec00..d2d3ab5567 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.html
@@ -1,6 +1,6 @@
<wicket:extend>
<div wicket:id="content"></div>
- <div class="foot pt-2 mt-5 border-top font-size-xs text-muted">Powered by <a href="https://onedev.io" class="text-muted text-hover-primary">OneDev</a></div>
+ <div class="foot pt-2 mt-5 border-top font-size-xs text-muted">Powered by <a wicket:id="vendor" class="text-muted text-hover-primary"></a></div>
<wicket:fragment wicket:id="passwordCheckFrag">
<form wicket:id="form" method="post">
<div wicket:id="feedback"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java
index 68f01f1b07..2da2b179f9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/LoginPage.java
@@ -5,6 +5,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.administration.BrandingSetting;
import io.onedev.server.model.support.administration.sso.SsoConnector;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.realm.PasswordAuthorizingRealm;
@@ -194,12 +195,22 @@ public class LoginPage extends SimplePage {
fragment.add(ssoButtonsView.setVisible(!settingManager.getSsoConnectors().isEmpty()));
add(fragment);
+
+ var brandingSetting = getSettingManager().getBrandingSetting();
+ if (brandingSetting.isOEM())
+ add(new ExternalLink("vendor", brandingSetting.getUrl(), brandingSetting.getName()));
+ else
+ add(new ExternalLink("vendor", BrandingSetting.DEFAULT_URL, BrandingSetting.DEFAULT_NAME));
}
private UserManager getUserManager() {
return OneDev.getInstance(UserManager.class);
}
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
+
private void afterLogin(User user) {
RememberMeManager rememberMeManager = OneDev.getInstance(RememberMeManager.class);
if (rememberMe) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 839209ea79..fee87f1bf7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -4,16 +4,11 @@ import io.onedev.server.web.page.base.BasePage;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import java.util.List;
-
public class TestPage extends BasePage {
- private List<FileUpload> uploads;
-
public TestPage(PageParameters params) {
super(params);
}