kanban/wedroid
2
0
Fork 0
Code Issues 4 Pull Requests Releases 1 Wiki Activity

Merge branch 'hotfix_color' of kanban/wedroid into develop
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
noemi3 2019-11-12 11:08:51 +00:00 committed by Gitea
commit dd9d4dc3eb
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wrapper/src/main/java/wekan/wrapper/entity/LabelColor.java → wrapper/src/main/java/wekan/wrapper/entity/Color.java
View File

@ -2,7 +2,9 @@ package wekan.wrapper.entity;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
public enum LabelColor { public enum Color {
@SerializedName("white")
WHITE,
@SerializedName("green") @SerializedName("green")
GREEN, GREEN,
@SerializedName("yellow") @SerializedName("yellow")

6
wrapper/src/main/java/wekan/wrapper/entity/Label.java
View File

@ -6,9 +6,9 @@ public class Label {
@SerializedName("_id") @SerializedName("_id")
private String id; private String id;
private String name; private String name;
private LabelColor color; private Color color;
public Label(String id, String name, LabelColor color) { public Label(String id, String name, Color color) {
this.id = id; this.id = id;
this.name = name; this.name = name;
this.color = color; this.color = color;
@ -22,7 +22,7 @@ public class Label {
return name; return name;
} }
public LabelColor getColor() { public Color getColor() {
return color; return color;
} }

2
wrapper/src/main/java/wekan/wrapper/entity/LabelPrototype.java
View File

@ -10,7 +10,7 @@ public class LabelPrototype {
* @param name The name of the new label * @param name The name of the new label
* @param color The color of the new label * @param color The color of the new label
*/ */
public LabelPrototype(String name, LabelColor color) { public LabelPrototype(String name, Color color) {
label = new Label(null, name, color); label = new Label(null, name, color);
} }
} }