Skip to content

The Unified and Autonomous Development Platform

Point doclink to github

Robin Shen7da47a21aa7d
diff --git a/core/src/main/java/io/onedev/server/OneDev.java b/core/src/main/java/io/onedev/server/OneDev.java
index 2adeb10e4c..be26786de2 100644
--- a/core/src/main/java/io/onedev/server/OneDev.java
+++ b/core/src/main/java/io/onedev/server/OneDev.java
@@ -6,8 +6,6 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.List;
import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -22,12 +20,12 @@ import io.onedev.launcher.loader.AbstractPlugin;
import io.onedev.launcher.loader.AppLoader;
import io.onedev.launcher.loader.ListenerRegistry;
import io.onedev.launcher.loader.ManagedSerializedForm;
-import io.onedev.server.manager.SettingManager;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStarting;
import io.onedev.server.event.system.SystemStopped;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.manager.DataManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.persistence.PersistManager;
import io.onedev.server.persistence.UnitOfWork;
@@ -45,8 +43,6 @@ public class OneDev extends AbstractPlugin implements Serializable {
private static final Logger logger = LoggerFactory.getLogger(OneDev.class);
- private static final Pattern DOCLINK_PATTERN = Pattern.compile("\\d+\\.\\d+");
-
private final JettyRunner jettyRunner;
private final PersistManager persistManager;
@@ -198,11 +194,7 @@ public class OneDev extends AbstractPlugin implements Serializable {
}
public String getDocLink() {
- String productVersion = AppLoader.getProduct().getVersion();
- Matcher matcher = DOCLINK_PATTERN.matcher(productVersion);
- if (!matcher.find())
- throw new RuntimeException("Unexpected product version format: " + productVersion);
- return "https://code.onedev.io/projects/onedev-docs/blob/" + matcher.group();
+ return "https://github.com/theonedev/onedev/wiki";
}
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
index ed68172670..5fcd719f91 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -16,7 +16,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String script;
@Editable(description="Groovy script to be evaluated. It should return a <i>boolean</i> value. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$onedev.docLink/Scripting' target='_blank'>scripting help</a> for details")
@NotEmpty
@Script
@OmitName
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
index ecebc56472..075d911833 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java
@@ -25,7 +25,7 @@ public class ScriptingChoices extends ChoiceProvider {
@Editable(description="Groovy script to be evaluated. The return value should be a value to color map, "
+ "for instance:<br>"
+ "<code>return [\"Successful\":\"#00ff00\", \"Failed\":\"#ff0000\"]</code>, "
- + "Use <tt>null</tt> if the value does not have a color. Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
+ + "Use <tt>null</tt> if the value does not have a color. Check <a href='$onedev.docLink/Scripting' target='_blank'>scripting help</a> for details")
@NotEmpty
@Script
@OmitName
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
index 9f8aa2c470..e97876c540 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java
@@ -18,7 +18,7 @@ public class ScriptingDefaultMultiValue implements DefaultMultiValueProvider {
private String script;
@Editable(description="Groovy script to be evaluated. It should return list of string. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$onedev.docLink/Scripting' target='_blank'>scripting help</a> for details")
@NotEmpty
@Script
@OmitName
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java
index 309498bede..df3dffabc1 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -16,7 +16,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String script;
@Editable(description="Groovy script to be evaluated. It should return a <i>string</i> value. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$onedev.docLink/Scripting' target='_blank'>scripting help</a> for details")
@NotEmpty
@Script
@OmitName
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
index c60ddca25f..30919f618e 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/dateinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -18,7 +18,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String script;
@Editable(description="Groovy script to be evaluated. It should return a <i>Date</i> value. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$onedev.docLink/Scripting' target='_blank'>scripting help</a> for details")
@NotEmpty
@Script
@OmitName
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
index 4102fada7b..5ffd829e10 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/ScriptingChoices.java
@@ -26,7 +26,7 @@ public class ScriptingChoices implements ChoiceProvider {
private String script;
@Editable(description="Groovy script to be evaluated. The return value should be a list of group facade object to be used as choices. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$onedev.docLink/Scripting' target='_blank'>scripting help</a> for details")
@NotEmpty
@Script
@OmitName
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
index 62b12fa8e4..a9f250c93b 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -16,7 +16,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String script;
@Editable(description="Groovy script to be evaluated. It should return name of a group. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$onedev.docLink/Scripting' target='_blank'>scripting help</a> for details")
@NotEmpty
@Script
@OmitName
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java
index a968465c16..de342b5e4b 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/numberinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -16,7 +16,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String script;
@Editable(description="Groovy script to be evaluated. It should return a <i>Integer</i> value. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$onedev.docLink/Scripting' target='_blank'>scripting help</a> for details")
@NotEmpty
@Script
@OmitName
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/ScriptingDefaultValue.java
index fd5b97719f..9c60e970fc 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -15,7 +15,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String script;
@Editable(description="Groovy script to be evaluated. It should return a <i>String</i> value. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$onedev.docLink/Scripting' target='_blank'>scripting help</a> for details")
@NotEmpty
@OmitName
@Multiline
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
index 7ae12b040d..962dfdf7d9 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/textinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -16,7 +16,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String script;
@Editable(description="Groovy script to be evaluated. It should return a <i>String</i> value. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$onedev.docLink/Scripting' target='_blank'>scripting help</a> for details")
@NotEmpty
@Script
@OmitName
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
index 19165e10aa..cd1dd18e1b 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java
@@ -26,7 +26,7 @@ public class ScriptingChoices implements ChoiceProvider {
private String script;
@Editable(description="Groovy script to be evaluated. The return value should be a list of user facade object to be used as choices. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$onedev.docLink/Scripting' target='_blank'>scripting help</a> for details")
@NotEmpty
@Script
@OmitName
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
index c6246d90be..49def7f6de 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
@@ -16,7 +16,7 @@ public class ScriptingDefaultValue implements DefaultValueProvider {
private String script;
@Editable(description="Groovy script to be evaluated. It should return login name of an user. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
+ + "Check <a href='$onedev.docLink/Scripting' target='_blank'>scripting help</a> for details")
@NotEmpty
@Script
@OmitName
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
index 27659aac08..2be9faf7ce 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js
@@ -338,7 +338,7 @@ onedev.server.textDiff = {
function showInvalidSelection() {
var $content = $("<div></div>");
$content.append("<a class='invalid'><i class='fa fa-warning'></i> Invalid selection, click for details</a>");
- $content.children("a").attr("href", doclink + "/diff-selection.md");
+ $content.children("a").attr("href", doclink + "/Diff-Selection");
return {
position: position,
content: $content
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 032324b10f..4074a0ad6b 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -165,7 +165,7 @@ public abstract class LayoutPage extends BasePage {
Plugin product = AppLoader.getProduct();
add(new Label("productVersion", product.getVersion()));
- add(new ExternalLink("docLink", OneDev.getInstance().getDocLink() + "/readme.md"));
+ add(new ExternalLink("docLink", OneDev.getInstance().getDocLink() + "/"));
WebMarkupContainer notSignedInContainer = new WebMarkupContainer("notSignedIn");
notSignedInContainer.add(new Link<Void>("signIn") {