The Unified and Autonomous Development Platform
Support empty color for color picker
robin shend576d2823ae2
diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.javaindex 488bc79c16..ce0d5460c8 100644--- a/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/StateSpec.java@@ -63,6 +63,7 @@ public class StateSpec implements Serializable {@Editable(order=400, description="Specify color of the state for displaying purpose")@Color+ @NotEmpty(message="choose a color for this state")public String getColor() {return color;}diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceprovider/Choice.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceprovider/Choice.javaindex 8d684d9b17..e823727ab5 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceprovider/Choice.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceprovider/Choice.java@@ -6,6 +6,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.util.editable.annotation.Color;import io.onedev.server.util.editable.annotation.Editable;+import io.onedev.server.util.editable.annotation.NameOfEmptyValue;@Editablepublic class Choice implements Serializable {@@ -14,7 +15,7 @@ public class Choice implements Serializable {private String value;- private String color = "#FFF";+ private String color;@Editable(order=100)@NotEmpty@@ -26,9 +27,9 @@ public class Choice implements Serializable {this.value = value;}- @Editable(order=200, description="Value will be displayed with this color")+ @Editable(order=200)@Color- @NotEmpty+ @NameOfEmptyValue("No color")public String getColor() {return color;}diff --git a/core/src/main/java/io/onedev/server/web/component/colorpicker/ColorPicker.java b/core/src/main/java/io/onedev/server/web/component/colorpicker/ColorPicker.javaindex 94a144795c..c11c077ba4 100644--- a/core/src/main/java/io/onedev/server/web/component/colorpicker/ColorPicker.java+++ b/core/src/main/java/io/onedev/server/web/component/colorpicker/ColorPicker.java@@ -9,8 +9,11 @@ import org.apache.wicket.model.IModel;@SuppressWarnings("serial")public class ColorPicker extends HiddenField<String> {- public ColorPicker(String id, IModel<String> model) {+ private final boolean allowEmpty;++ public ColorPicker(String id, IModel<String> model, boolean allowEmpty) {super(id, model);+ this.allowEmpty = allowEmpty;}@Override@@ -18,7 +21,8 @@ public class ColorPicker extends HiddenField<String> {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new ColorPickerResourceReference()));- String script = String.format("onedev.server.colorPicker.onDomReady('%s');", getMarkupId(true));+ String script = String.format("onedev.server.colorPicker.onDomReady('%s', %b);",+ getMarkupId(true), allowEmpty);response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.js b/core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.jsindex 45dafa4570..c6f89b2970 100644--- a/core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.js+++ b/core/src/main/java/io/onedev/server/web/component/colorpicker/color-picker.js@@ -1,10 +1,11 @@onedev.server.colorPicker = {- onDomReady: function(inputId) {+ onDomReady: function(inputId, allowEmpty) {var $input = $("#" + inputId);- if ($input.val().length == 0)- $input.val("#000");$input.spectrum({- preferredFormat: "hex"+ preferredFormat: "hex",+ showInput: true,+ showInitial: true,+ allowEmpty: allowEmpty});}}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.javaindex 47b41b776e..aa59bc9c69 100644--- a/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/color/ColorPropertyEditor.java@@ -2,6 +2,8 @@ package io.onedev.server.web.editable.color;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;@@ -25,7 +27,7 @@ public class ColorPropertyEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- input = new ColorPicker("input", Model.of(getModelObject()));+ input = new ColorPicker("input", Model.of(getModelObject()), !getPropertyDescriptor().isPropertyRequired());add(input);input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));@@ -49,4 +51,10 @@ public class ColorPropertyEditor extends PropertyEditor<String> {return input.getConvertedInput();}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ColorSupportResourceReference()));+ }+}diff --git a/core/src/main/java/io/onedev/server/web/editable/color/ColorSupportResourceReference.java b/core/src/main/java/io/onedev/server/web/editable/color/ColorSupportResourceReference.javanew file mode 100644index 0000000000..f044dbf703--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/color/ColorSupportResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.editable.color;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class ColorSupportResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public ColorSupportResourceReference() {+ super(ColorSupportResourceReference.class, "color-support.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/editable/color/color-support.css b/core/src/main/java/io/onedev/server/web/editable/color/color-support.cssnew file mode 100644index 0000000000..2c42686287--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/color/color-support.css@@ -0,0 +1,3 @@+.has-error .sp-replacer {+ border-color: #b94a48;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex 0cbff9ebc5..fc8e3c3903 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -369,7 +369,7 @@ public class IssueDetailPage extends ProjectPage implements InputContext {try {String color = choiceProvider.getChoices(false).get(value);String style = "padding: 0 4px; border-radius: 3px;";- if (color != null && !color.toLowerCase().equals("#fff"))+ if (color != null)style += "background: " + color + "; color: white;";valueLabel.add(AttributeAppender.append("style", style));} finally {diff --git a/core/src/main/java/io/onedev/server/web/page/test/Bean.java b/core/src/main/java/io/onedev/server/web/page/test/Bean.javaindex 25882bd889..b844c72b61 100644--- a/core/src/main/java/io/onedev/server/web/page/test/Bean.java+++ b/core/src/main/java/io/onedev/server/web/page/test/Bean.java@@ -1,41 +1,22 @@package io.onedev.server.web.page.test;import java.io.Serializable;-import java.util.List;import org.hibernate.validator.constraints.NotEmpty;-import com.google.common.collect.Lists;--import io.onedev.server.util.editable.annotation.ChoiceProvider;import io.onedev.server.util.editable.annotation.Color;import io.onedev.server.util.editable.annotation.Editable;-import io.onedev.server.util.editable.annotation.Script;@Editablepublic class Bean implements Serializable {private static final long serialVersionUID = 1L;- private String script;-private String color;- private String state;-- @Editable(order=50)- @Script- @NotEmpty- public String getScript() {- return script;- }-- public void setScript(String script) {- this.script = script;- }-@Editable(order=100)@Color+ @NotEmptypublic String getColor() {return color;}@@ -44,19 +25,4 @@ public class Bean implements Serializable {this.color = color;}- @Editable(order=200)- @ChoiceProvider("getStateChoices")- @NotEmpty- public String getState() {- return state;- }-- public void setState(String state) {- this.state = state;- }-- @SuppressWarnings("unused")- private static List<String> getStateChoices() {- return Lists.newArrayList("a", "b", "c");- }}diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex be9be52862..b887c0c191 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -2,54 +2,7 @@<div class="center-box"><form wicket:id="form"><div wicket:id="editor"></div>- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <p>1- <button wicket:id="submit" type="submit" class="btn btn-default">Submit</button>+ <button type="submit" class="btn btn-default">Submit</button></form></div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex d1d0a84612..cbf337f893 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -1,13 +1,8 @@package io.onedev.server.web.page.test;-import java.io.Serializable;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;import io.onedev.server.web.editable.BeanContext;@@ -20,19 +15,17 @@ public class TestPage extends BasePage {protected void onInitialize() {super.onInitialize();- Serializable bean = new Bean();+ Bean bean = new Bean();Form<?> form = new Form<Void>("form") {@Override- protected void onError() {- super.onError();- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);- target.add(this);+ protected void onSubmit() {+ super.onSubmit();+ System.out.println(bean.getColor());}};form.add(BeanContext.editBean("editor", bean));- form.add(new AjaxButton("submit") {});form.setOutputMarkupId(true);add(form);}