SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'main' into module/timetracking

Browse Source
This commit is contained in:
Stephan Richter
2025-08-26 09:07:38 +02:00
parent 7ab844bcff cc89bada3a
commit dcd51d0ea3
23 changed files with 310 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/de/srsoftware/umbrella/core/Constants.java
View File

@@ -98,6 +98,7 @@ public class Constants {
public static final String FIELD_TYPE_PREFIX = "type_prefix";
public static final String FIELD_TYPE_SUFFIX = "type_suffix";
public static final String FIELD_UNIT = "unit";
public static final String FULLTEXT = "fulltext";
public static final String GET = "GET";

2
core/src/main/java/de/srsoftware/umbrella/core/model/Project.java
View File

@@ -31,7 +31,7 @@ public class Project implements Mappable {
this.companyId = companyId;
this.showClosed = showClosed;
this.members = members;
this.allowedStates = allowedStates;
this.allowedStates = new ArrayList<>(allowedStates);
}
public Collection<Status> allowedStates(){

2
core/src/main/java/de/srsoftware/umbrella/core/model/Status.java
View File

@@ -17,7 +17,7 @@ public record Status(String name, int code) implements Mappable {
public static final Status STARTED = new Status("STARTED",40); // was 20
public static final Status COMPLETE = new Status("COMPLETE",60);
public static final Status CANCELLED = new Status("CANCELLED", 100);
public static final List<Status> PREDEFINED = new ArrayList<>(List.of(OPEN, STARTED, PENDING, COMPLETE, CANCELLED));
public static final List<Status> PREDEFINED = List.of(OPEN, STARTED, PENDING, COMPLETE, CANCELLED);
public static Status of(int code){
return switch (code){