The Unified and Autonomous Development Platform
Fix the issue that quickly type in editor and tab can not focus on link of field description
Robin Shenf726ed6edf6c
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex 384fee116d..a3abb79ed1 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -32,7 +32,6 @@ import org.apache.wicket.validation.IValidatable;import org.apache.wicket.validation.IValidator;import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.PathNode.Named;@@ -119,8 +118,6 @@ public class BeanEditor extends ValueEditor<Serializable> {private WebMarkupContainer newItem(String id, PropertyContext<Serializable> property) {WebMarkupContainer item = new PropertyContainer(id, property) {- private Label descriptionLabel;-@Overrideprotected void onInitialize() {super.onInitialize();@@ -173,15 +170,7 @@ public class BeanEditor extends ValueEditor<Serializable> {PropertyEditor<Serializable> propertyEditor = property.renderForEdit("value", Model.of(propertyValue));valueContainer.add(propertyEditor);- descriptionLabel = new Label("description", property.getDescriptor().getDescription(this)) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(StringUtils.isNotBlank(getModelValue()));- }-- };+ Label descriptionLabel = new Label("description", property.getDescriptor().getDescription());descriptionLabel.setEscapeModelStrings(false);descriptionLabel.setOutputMarkupPlaceholderTag(true);valueContainer.add(descriptionLabel);@@ -189,13 +178,6 @@ public class BeanEditor extends ValueEditor<Serializable> {valueContainer.add(new FencedFeedbackPanel("feedback", propertyEditor));}- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (event.getPayload() instanceof PropertyUpdating)- ((PropertyUpdating)event.getPayload()).getHandler().add(descriptionLabel);- }-@Overridepublic Object getInputValue(String name) {/*diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.javaindex 7a387e52ea..e09079d32c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java@@ -10,17 +10,12 @@ import javax.annotation.Nullable;import javax.validation.constraints.NotNull;import javax.validation.constraints.Size;-import org.apache.wicket.Application;-import org.apache.wicket.Component;import org.hibernate.validator.constraints.NotEmpty;import com.google.common.collect.Sets;import io.onedev.commons.utils.BeanUtils;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.commons.utils.ReflectionUtils;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.OneDev;import io.onedev.server.util.ComponentContext;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ShowCondition;@@ -172,20 +167,5 @@ public class PropertyDescriptor implements Serializable {public String getDescription() {return EditableUtils.getDescription(getPropertyGetter());}-- public String getDescription(Component component) {- String description = getDescription();- if (description != null) {- ComponentContext.push(new ComponentContext(component));- try {- description = Application.get().getResourceSettings().getLocalizer().getString(description, component, description);- description = StringUtils.replace(description, "$docRoot", OneDev.getInstance().getDocRoot());- return HtmlUtils.clean(description).body().html();- } finally {- ComponentContext.pop();- }- } else {- return null;- }- }+}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.javaindex b14f784038..e52a2d491e 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@@ -11,8 +11,6 @@ import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")public class TestPage extends BasePage {- static Thread thread;-public TestPage(PageParameters params) {super(params);}