The Unified and Autonomous Development Platform
feat: Able to customize hours of a day for time tracking (#1833)
Robin Shena105b435e27c
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/WorkingPeriodParam.java b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/WorkingPeriodParam.javaindex 0b8dbd69f1..8758c3fb37 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/param/spec/WorkingPeriodParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/spec/WorkingPeriodParam.java@@ -1,14 +1,14 @@package io.onedev.server.buildspec.param.spec;-import java.util.List;-import java.util.Map;--import javax.validation.Valid;-+import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.WorkingPeriodInput;import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.util.DateUtils;-import io.onedev.server.annotation.Editable;+import io.onedev.server.entitymanager.SettingManager;++import javax.validation.Valid;+import java.util.List;+import java.util.Map;@Editable(order=700, name=ParamSpec.WORKING_PERIOD)public class WorkingPeriodParam extends ParamSpec {@@ -50,10 +50,12 @@ public class WorkingPeriodParam extends ParamSpec {@Overridepublic long getOrdinal(String fieldValue) {- if (fieldValue != null)- return DateUtils.parseWorkingPeriod(fieldValue);- else+ if (fieldValue != null) {+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();+ return timeTrackingSetting.parseWorkingPeriod(fieldValue);+ } else {return super.getOrdinal(fieldValue);+ }}}diff --git a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/WorkingPeriodInput.java b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/WorkingPeriodInput.javaindex eedd0bd7dc..a7c7e0bb47 100755--- a/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/WorkingPeriodInput.java+++ b/server-core/src/main/java/io/onedev/server/buildspecmodel/inputspec/workingperiodinput/WorkingPeriodInput.java@@ -1,17 +1,17 @@package io.onedev.server.buildspecmodel.inputspec.workingperiodinput;+import com.google.common.collect.Lists;+import io.onedev.server.OneDev;+import io.onedev.server.buildspecmodel.inputspec.InputSpec;+import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.issue.TimeTrackingSetting;++import javax.validation.ValidationException;import java.util.ArrayList;import java.util.List;import java.util.Map;-import javax.validation.ValidationException;--import com.google.common.collect.Lists;--import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;-import io.onedev.server.buildspecmodel.inputspec.InputSpec;-import io.onedev.server.util.DateUtils;-public class WorkingPeriodInput {public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,@@ -27,11 +27,15 @@ public class WorkingPeriodInput {return buffer.toString();}++ private static TimeTrackingSetting getTimeTrackingSetting() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();+ }public static Object convertToObject(List<String> strings) {try {if (strings.size() == 1)- return DateUtils.parseWorkingPeriod(strings.iterator().next());+ return getTimeTrackingSetting().parseWorkingPeriod(strings.iterator().next());else if (strings.size() == 0)return null;else@@ -43,7 +47,7 @@ public class WorkingPeriodInput {public static List<String> convertToStrings(Object value) {if (value != null)- return Lists.newArrayList(DateUtils.formatWorkingPeriod((int) value));+ return Lists.newArrayList(getTimeTrackingSetting().formatWorkingPeriod((int) value));elsereturn new ArrayList<>();}diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 9e2fb6557f..8da96fbdc8 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -6318,5 +6318,28 @@ public class DataMigrator {dom.writeToFile(file, false);}}- }+ }++ private void migrate161(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ String key = element.elementTextTrim("key");+ if (key.equals("ISSUE")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ var timeTrackingSettingElement = valueElement.element("timeTrackingSetting");+ if (timeTrackingSettingElement != null) {+ timeTrackingSettingElement.addElement("hoursPerDay").setText("8");+ timeTrackingSettingElement.addElement("daysPerWeek").setText("5");+ }+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex 226cc70700..c2b3ee1a70 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -50,8 +50,6 @@ import javax.persistence.criteria.*;import java.util.*;import java.util.stream.Collectors;-import static org.apache.commons.lang3.time.DateFormatUtils.ISO_8601_EXTENDED_DATE_FORMAT;-@Singletonpublic class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> implements CodeCommentManager {@@ -191,7 +189,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imList<String> newLines = Preconditions.checkNotNull(project.readLines(new BlobIdent(commitId.name(), path, FileMode.REGULAR_FILE.getBits()),- WhitespaceOption.DEFAULT, true));+ WhitespaceOption.IGNORE_TRAILING, true));Collections.sort(historyCommits, new Comparator<RevCommit>() {@@ -209,7 +207,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imfor (Map.Entry<String, List<CodeComment>> pathEntry: commentsOnCommit.entrySet()) {List<String> oldLines = project.readLines(new BlobIdent(historyCommit.name(), pathEntry.getKey(), FileMode.REGULAR_FILE.getBits()),- WhitespaceOption.DEFAULT, false);+ WhitespaceOption.IGNORE_TRAILING, false);if (oldLines != null) {Map<Integer, Integer> lineMapping;if (oldLines.size() + newLines.size() <= DiffUtils.MAX_DIFF_SIZE)diff --git a/server-core/src/main/java/io/onedev/server/git/BlobChange.java b/server-core/src/main/java/io/onedev/server/git/BlobChange.javaindex 34dbdf1d89..b2624fc518 100644--- a/server-core/src/main/java/io/onedev/server/git/BlobChange.java+++ b/server-core/src/main/java/io/onedev/server/git/BlobChange.java@@ -1,249 +1,249 @@-package io.onedev.server.git;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.List;-import java.util.Map;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.eclipse.jgit.diff.DiffEntry.ChangeType;-import org.eclipse.jgit.lib.ObjectId;--import com.google.common.base.Preconditions;--import io.onedev.commons.utils.PlanarRange;-import io.onedev.server.codequality.CodeProblem;-import io.onedev.server.codequality.CoverageStatus;-import io.onedev.server.model.CodeComment;-import io.onedev.server.model.Project;-import io.onedev.server.model.support.Mark;-import io.onedev.server.util.Pair;-import io.onedev.server.util.diff.DiffBlock;-import io.onedev.server.util.diff.DiffMatchPatch.Operation;-import io.onedev.server.util.diff.DiffUtils;-import io.onedev.server.util.diff.WhitespaceOption;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.util.DiffPlanarRange;--@SuppressWarnings("serial")-public abstract class BlobChange implements Serializable {-- protected final ChangeType type;-- protected final WhitespaceOption whitespaceOption;-- protected final BlobIdent oldBlobIdent;-- protected final BlobIdent newBlobIdent;-- private transient List<DiffBlock<String>> diffBlocks;-- public BlobChange(ChangeType type, BlobIdent oldBlobIdent, BlobIdent newBlobIdent,- WhitespaceOption whitespaceOption) {- this.type = type;- this.oldBlobIdent = oldBlobIdent;- this.newBlobIdent = newBlobIdent;- this.whitespaceOption = whitespaceOption;- }-- public ChangeType getType() {- return type;- }-- public BlobIdent getOldBlobIdent() {- return oldBlobIdent;- }-- public BlobIdent getNewBlobIdent() {- return newBlobIdent;- }-- public BlobIdent getBlobIdent() {- return newBlobIdent.path!=null? newBlobIdent: oldBlobIdent;- }-- public String getPath() {- return newBlobIdent.path != null? newBlobIdent.path: oldBlobIdent.path;- }-- public List<DiffBlock<String>> getDiffBlocks() {- if (diffBlocks == null) {- try {- if (type == ChangeType.ADD || type == ChangeType.COPY) {- if (getNewText() != null) {- List<String> newLines = getNewText().getLines();- if (newLines.size() <= DiffUtils.MAX_DIFF_SIZE) {- List<String> oldLines = new ArrayList<>();- diffBlocks = DiffUtils.diff(oldLines, newLines, WhitespaceOption.DEFAULT);- } else {- diffBlocks = new ArrayList<>();- }- } else {- diffBlocks = new ArrayList<>();- }- } else if (type == ChangeType.DELETE) {- if (getOldText() != null) {- List<String> oldLines = getOldText().getLines();- if (oldLines.size() <= DiffUtils.MAX_DIFF_SIZE) {- List<String> newLines = new ArrayList<>();- diffBlocks = DiffUtils.diff(oldLines, newLines, WhitespaceOption.DEFAULT);- } else {- diffBlocks = new ArrayList<>();- }- } else {- diffBlocks = new ArrayList<>();- }- } else {- if (getOldText() != null && getNewText() != null) {- List<String> oldLines = getOldText().getLines();- List<String> newLines = getNewText().getLines();- if (oldLines.size() + newLines.size() <= DiffUtils.MAX_DIFF_SIZE)- diffBlocks = DiffUtils.diff(oldLines, newLines, whitespaceOption);- else- diffBlocks = new ArrayList<>();- } else {- diffBlocks = new ArrayList<>();- }- }- } catch (Exception e) {- throw new RuntimeException("Error calculating diff of file: " + getPath(), e);- }- }- return diffBlocks;- }-- public int getAdditions() {- int additions = 0;- for (DiffBlock<String> diff: getDiffBlocks()) {- if (diff.getOperation() == Operation.INSERT)- additions += diff.getElements().size();- }- return additions;- }-- public int getDeletions() {- int deletions = 0;- for (DiffBlock<String> diff: getDiffBlocks()) {- if (diff.getOperation() == Operation.DELETE)- deletions += diff.getElements().size();- }- return deletions;- }-- public Blob getOldBlob() {- Preconditions.checkNotNull(oldBlobIdent.path);- return getProject().getBlob(oldBlobIdent, true);- }-- public Blob getNewBlob() {- Preconditions.checkNotNull(newBlobIdent.path);- return getProject().getBlob(newBlobIdent, true);- }-- @Nullable- public Blob.Text getOldText() {- return getOldBlob().getText();- }-- @Nullable- public Blob.Text getNewText() {- return getNewBlob().getText();- }-- public WhitespaceOption getWhitespaceOption() {- return whitespaceOption;- }-- public Collection<String> getPaths() {- Collection<String> paths = new HashSet<>();- if (oldBlobIdent.path != null)- paths.add(oldBlobIdent.path);- if (newBlobIdent.path != null)- paths.add(newBlobIdent.path);- return paths;- }-- public boolean isVisible(DiffPlanarRange range) {- for (int line = range.getFromRow(); line<=range.getToRow(); line++) {- if (!DiffUtils.isVisible(getDiffBlocks(), range.isLeftSide(), line, WebConstants.DIFF_CONTEXT_SIZE))- return false;- }- return true;- }-- public boolean isVisible(boolean leftSide, int line) {- return DiffUtils.isVisible(getDiffBlocks(), leftSide, line, WebConstants.DIFF_CONTEXT_SIZE);- }-- public abstract Project getProject();-- @Nullable- public AnnotationSupport getAnnotationSupport() {- return null;- }-- public ObjectId getOldCommitId() {- if (oldBlobIdent.revision.equals(ObjectId.zeroId().name().toString()))- return ObjectId.zeroId();- else- return getProject().getRevCommit(oldBlobIdent.revision, true);- }-- public ObjectId getNewCommitId() {- if (newBlobIdent.revision.equals(ObjectId.zeroId().name().toString()))- return ObjectId.zeroId();- else- return getProject().getRevCommit(newBlobIdent.revision, true);- }-- public Mark getMark(DiffPlanarRange range) {- Mark mark = new Mark();- mark.setRange(new PlanarRange(range));- if (range.isLeftSide()) {- mark.setCommitHash(getOldCommitId().name());- mark.setPath(oldBlobIdent.path);- } else {- mark.setCommitHash(getNewCommitId().name());- mark.setPath(newBlobIdent.path);- }- return mark;- }-- public static interface AnnotationSupport extends Serializable {-- @Nullable- DiffPlanarRange getMarkRange();-- String getMarkUrl(DiffPlanarRange markRange);-- Map<CodeComment, PlanarRange> getOldComments();-- Map<CodeComment, PlanarRange> getNewComments();-- Collection<CodeProblem> getOldProblems();-- Collection<CodeProblem> getNewProblems();-- Map<Integer, CoverageStatus> getOldCoverages();-- Map<Integer, CoverageStatus> getNewCoverages();-- DiffPlanarRange getCommentRange(CodeComment comment);-- @Nullable- Pair<CodeComment, DiffPlanarRange> getOpenComment();-- void onOpenComment(AjaxRequestTarget target, CodeComment comment, DiffPlanarRange commentRange);-- void onAddComment(AjaxRequestTarget target, DiffPlanarRange commentRange);-- Component getCommentContainer();-- }--}+package io.onedev.server.git;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.eclipse.jgit.diff.DiffEntry.ChangeType;+import org.eclipse.jgit.lib.ObjectId;++import com.google.common.base.Preconditions;++import io.onedev.commons.utils.PlanarRange;+import io.onedev.server.codequality.CodeProblem;+import io.onedev.server.codequality.CoverageStatus;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.Mark;+import io.onedev.server.util.Pair;+import io.onedev.server.util.diff.DiffBlock;+import io.onedev.server.util.diff.DiffMatchPatch.Operation;+import io.onedev.server.util.diff.DiffUtils;+import io.onedev.server.util.diff.WhitespaceOption;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.util.DiffPlanarRange;++@SuppressWarnings("serial")+public abstract class BlobChange implements Serializable {++ protected final ChangeType type;++ protected final WhitespaceOption whitespaceOption;++ protected final BlobIdent oldBlobIdent;++ protected final BlobIdent newBlobIdent;++ private transient List<DiffBlock<String>> diffBlocks;++ public BlobChange(ChangeType type, BlobIdent oldBlobIdent, BlobIdent newBlobIdent,+ WhitespaceOption whitespaceOption) {+ this.type = type;+ this.oldBlobIdent = oldBlobIdent;+ this.newBlobIdent = newBlobIdent;+ this.whitespaceOption = whitespaceOption;+ }++ public ChangeType getType() {+ return type;+ }++ public BlobIdent getOldBlobIdent() {+ return oldBlobIdent;+ }++ public BlobIdent getNewBlobIdent() {+ return newBlobIdent;+ }++ public BlobIdent getBlobIdent() {+ return newBlobIdent.path!=null? newBlobIdent: oldBlobIdent;+ }++ public String getPath() {+ return newBlobIdent.path != null? newBlobIdent.path: oldBlobIdent.path;+ }++ public List<DiffBlock<String>> getDiffBlocks() {+ if (diffBlocks == null) {+ try {+ if (type == ChangeType.ADD || type == ChangeType.COPY) {+ if (getNewText() != null) {+ List<String> newLines = getNewText().getLines();+ if (newLines.size() <= DiffUtils.MAX_DIFF_SIZE) {+ List<String> oldLines = new ArrayList<>();+ diffBlocks = DiffUtils.diff(oldLines, newLines, WhitespaceOption.IGNORE_TRAILING);+ } else {+ diffBlocks = new ArrayList<>();+ }+ } else {+ diffBlocks = new ArrayList<>();+ }+ } else if (type == ChangeType.DELETE) {+ if (getOldText() != null) {+ List<String> oldLines = getOldText().getLines();+ if (oldLines.size() <= DiffUtils.MAX_DIFF_SIZE) {+ List<String> newLines = new ArrayList<>();+ diffBlocks = DiffUtils.diff(oldLines, newLines, WhitespaceOption.IGNORE_TRAILING);+ } else {+ diffBlocks = new ArrayList<>();+ }+ } else {+ diffBlocks = new ArrayList<>();+ }+ } else {+ if (getOldText() != null && getNewText() != null) {+ List<String> oldLines = getOldText().getLines();+ List<String> newLines = getNewText().getLines();+ if (oldLines.size() + newLines.size() <= DiffUtils.MAX_DIFF_SIZE)+ diffBlocks = DiffUtils.diff(oldLines, newLines, whitespaceOption);+ else+ diffBlocks = new ArrayList<>();+ } else {+ diffBlocks = new ArrayList<>();+ }+ }+ } catch (Exception e) {+ throw new RuntimeException("Error calculating diff of file: " + getPath(), e);+ }+ }+ return diffBlocks;+ }++ public int getAdditions() {+ int additions = 0;+ for (DiffBlock<String> diff: getDiffBlocks()) {+ if (diff.getOperation() == Operation.INSERT)+ additions += diff.getElements().size();+ }+ return additions;+ }++ public int getDeletions() {+ int deletions = 0;+ for (DiffBlock<String> diff: getDiffBlocks()) {+ if (diff.getOperation() == Operation.DELETE)+ deletions += diff.getElements().size();+ }+ return deletions;+ }++ public Blob getOldBlob() {+ Preconditions.checkNotNull(oldBlobIdent.path);+ return getProject().getBlob(oldBlobIdent, true);+ }++ public Blob getNewBlob() {+ Preconditions.checkNotNull(newBlobIdent.path);+ return getProject().getBlob(newBlobIdent, true);+ }++ @Nullable+ public Blob.Text getOldText() {+ return getOldBlob().getText();+ }++ @Nullable+ public Blob.Text getNewText() {+ return getNewBlob().getText();+ }++ public WhitespaceOption getWhitespaceOption() {+ return whitespaceOption;+ }++ public Collection<String> getPaths() {+ Collection<String> paths = new HashSet<>();+ if (oldBlobIdent.path != null)+ paths.add(oldBlobIdent.path);+ if (newBlobIdent.path != null)+ paths.add(newBlobIdent.path);+ return paths;+ }++ public boolean isVisible(DiffPlanarRange range) {+ for (int line = range.getFromRow(); line<=range.getToRow(); line++) {+ if (!DiffUtils.isVisible(getDiffBlocks(), range.isLeftSide(), line, WebConstants.DIFF_CONTEXT_SIZE))+ return false;+ }+ return true;+ }++ public boolean isVisible(boolean leftSide, int line) {+ return DiffUtils.isVisible(getDiffBlocks(), leftSide, line, WebConstants.DIFF_CONTEXT_SIZE);+ }++ public abstract Project getProject();++ @Nullable+ public AnnotationSupport getAnnotationSupport() {+ return null;+ }++ public ObjectId getOldCommitId() {+ if (oldBlobIdent.revision.equals(ObjectId.zeroId().name().toString()))+ return ObjectId.zeroId();+ else+ return getProject().getRevCommit(oldBlobIdent.revision, true);+ }++ public ObjectId getNewCommitId() {+ if (newBlobIdent.revision.equals(ObjectId.zeroId().name().toString()))+ return ObjectId.zeroId();+ else+ return getProject().getRevCommit(newBlobIdent.revision, true);+ }++ public Mark getMark(DiffPlanarRange range) {+ Mark mark = new Mark();+ mark.setRange(new PlanarRange(range));+ if (range.isLeftSide()) {+ mark.setCommitHash(getOldCommitId().name());+ mark.setPath(oldBlobIdent.path);+ } else {+ mark.setCommitHash(getNewCommitId().name());+ mark.setPath(newBlobIdent.path);+ }+ return mark;+ }++ public static interface AnnotationSupport extends Serializable {++ @Nullable+ DiffPlanarRange getMarkRange();++ String getMarkUrl(DiffPlanarRange markRange);++ Map<CodeComment, PlanarRange> getOldComments();++ Map<CodeComment, PlanarRange> getNewComments();++ Collection<CodeProblem> getOldProblems();++ Collection<CodeProblem> getNewProblems();++ Map<Integer, CoverageStatus> getOldCoverages();++ Map<Integer, CoverageStatus> getNewCoverages();++ DiffPlanarRange getCommentRange(CodeComment comment);++ @Nullable+ Pair<CodeComment, DiffPlanarRange> getOpenComment();++ void onOpenComment(AjaxRequestTarget target, CodeComment comment, DiffPlanarRange commentRange);++ void onAddComment(AjaxRequestTarget target, DiffPlanarRange commentRange);++ Component getCommentContainer();++ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java b/server-core/src/main/java/io/onedev/server/model/support/CompareContext.javaindex 0ba9554dc4..debbb9216a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java+++ b/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java@@ -46,7 +46,7 @@ public class CompareContext implements Serializable {private String currentFile;@Column(nullable=false)- private WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;+ private WhitespaceOption whitespaceOption = WhitespaceOption.IGNORE_TRAILING;public String getOldCommitHash() {return oldCommitHash;diff --git a/server-core/src/main/java/io/onedev/server/model/support/Mark.java b/server-core/src/main/java/io/onedev/server/model/support/Mark.javaindex 0dee638697..8b5ae9f41f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/Mark.java+++ b/server-core/src/main/java/io/onedev/server/model/support/Mark.java@@ -116,12 +116,12 @@ public class Mark implements Serializable {if (newBlob == null || newBlob.getText() == null)return null;for (String line: newBlob.getText().getLines())- newLines.add(WhitespaceOption.DEFAULT.apply(line));+ newLines.add(WhitespaceOption.IGNORE_TRAILING.apply(line));List<String> oldLines = new ArrayList<>();Blob oldBlob = gitService.getBlob(project, ObjectId.fromString(commitHash), path);for (String line: oldBlob.getText().getLines())- oldLines.add(WhitespaceOption.DEFAULT.apply(line));+ oldLines.add(WhitespaceOption.IGNORE_TRAILING.apply(line));Map<Integer, Integer> lineMapping = DiffUtils.mapLines(oldLines, newLines);diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.javaindex e886951eaf..23aa66988c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TimeTrackingSetting.java@@ -7,19 +7,57 @@ import io.onedev.server.entitymanager.LinkSpecManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.util.usage.Usage;+import org.apache.commons.lang3.StringUtils;+import javax.validation.ValidationException;+import javax.validation.constraints.Max;+import javax.validation.constraints.Min;import java.io.Serializable;import java.util.ArrayList;import java.util.LinkedHashSet;import java.util.List;+import java.util.regex.Matcher;+import java.util.regex.Pattern;@Editablepublic class TimeTrackingSetting implements Serializable {private static final long serialVersionUID = 1L;- private String aggregationLink;+ private static final Pattern WORKING_PERIOD_PATTERN = Pattern.compile("(\\d+w)?(\\d+d)?(\\d+h)?(\\d+m)?");+ private int hoursPerDay = 8;++ private int daysPerWeek = 5;++ private String aggregationLink;++ @Editable(order=100, description = "Specify working hours per day. This will affect " ++ "parsing and displaying of working periods. For instance <tt>1d</tt> is the " ++ "same as <tt>8h</tt> if this property is set to <tt>8</tt>")+ @Max(24)+ @Min(1)+ public int getHoursPerDay() {+ return hoursPerDay;+ }++ public void setHoursPerDay(int hoursPerDay) {+ this.hoursPerDay = hoursPerDay;+ }++ @Editable(order=200, description = "Specify working days per week. This will affect " ++ "parsing and displaying of working periods. For instance <tt>1w</tt> is the " ++ "same as <tt>5d</tt> if this property is set to <tt>5</tt>")+ @Max(7)+ @Min(1)+ public int getDaysPerWeek() {+ return daysPerWeek;+ }++ public void setDaysPerWeek(int daysPerWeek) {+ this.daysPerWeek = daysPerWeek;+ }+@Editable(order=500, placeholder = "No aggregation", description = "If specified, total estimated/spent time " +"of an issue will also include linked issues of this type")@ChoiceProvider("getLinkChoices")@@ -57,5 +95,68 @@ public class TimeTrackingSetting implements Serializable {if (oldName.equals(aggregationLink))aggregationLink = newName;}++ public int parseWorkingPeriod(String period) {+ period = StringUtils.deleteWhitespace(period);+ if (StringUtils.isBlank(period))+ throw new ValidationException("Invalid working period");++ if (period.equals("0"))+ return 0;++ Matcher matcher = WORKING_PERIOD_PATTERN.matcher(period);+ if (!matcher.matches())+ throw new ValidationException("Invalid working period");++ int minutes = 0;+ if (matcher.group(1) != null) {+ int weeks = Integer.parseInt(StringUtils.stripEnd(matcher.group(1), "w"));+ minutes += weeks * daysPerWeek * hoursPerDay * 60;+ }++ if (matcher.group(2) != null) {+ int days = Integer.parseInt(StringUtils.stripEnd(matcher.group(2), "d"));+ minutes += days * hoursPerDay * 60;+ }++ if (matcher.group(3) != null) {+ int hours = Integer.parseInt(StringUtils.stripEnd(matcher.group(3), "h"));+ minutes += hours*60;+ }++ if (matcher.group(4) != null)+ minutes += Integer.parseInt(StringUtils.stripEnd(matcher.group(4), "m"));++ return minutes;+ }++ public String formatWorkingPeriod(int minutes) {+ int weeks = minutes / (60 * hoursPerDay * daysPerWeek);+ minutes = minutes % (60 * hoursPerDay * daysPerWeek);+ int days = minutes / (60 * hoursPerDay);+ minutes = minutes % (60 * hoursPerDay);+ int hours = minutes / 60;+ minutes = minutes % 60;++ StringBuilder builder = new StringBuilder();+ if (weeks != 0)+ builder.append(weeks).append("w ");+ if (days != 0)+ builder.append(days).append("d ");+ if (hours != 0)+ builder.append(hours).append("h ");+ if (minutes != 0)+ builder.append(minutes).append("m");++ String formatted = builder.toString().trim();+ if (formatted.length() == 0)+ formatted = "0m";+ return formatted;+ }++ public String getWorkingPeriodHelp() {+ return String.format("Expects one or more <tt><number>(w|d|h|m)</tt>. For instance <tt>1w 1d 1h 1m</tt> represents 1 week (%d days), 1 day (%d hours), 1 hour, and 1 minute",+ daysPerWeek, hoursPerDay);+ }}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnEstimatedTimeChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnEstimatedTimeChangeData.javaindex b0dded80af..0c4d7723fd 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnEstimatedTimeChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnEstimatedTimeChangeData.java@@ -1,9 +1,10 @@package io.onedev.server.model.support.issue.changedata;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Group;import io.onedev.server.model.User;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.util.DateUtils;import java.util.Collection;import java.util.HashMap;@@ -49,10 +50,11 @@ public class IssueOwnEstimatedTimeChangeData extends IssueChangeData {@Overridepublic ActivityDetail getActivityDetail() {+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();Map<String, String> oldFieldValues = new HashMap<>();- oldFieldValues.put("Own Estimated Time", DateUtils.formatWorkingPeriod(oldValue));+ oldFieldValues.put("Own Estimated Time", timeTrackingSetting.formatWorkingPeriod(oldValue));Map<String, String> newFieldValues = new HashMap<>();- newFieldValues.put("Own Estimated Time", DateUtils.formatWorkingPeriod(newValue));+ newFieldValues.put("Own Estimated Time", timeTrackingSetting.formatWorkingPeriod(newValue));return ActivityDetail.compare(oldFieldValues, newFieldValues, true);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnSpentTimeChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnSpentTimeChangeData.javaindex 2933bfa671..547db0cf5f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnSpentTimeChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueOwnSpentTimeChangeData.java@@ -1,5 +1,7 @@package io.onedev.server.model.support.issue.changedata;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Group;import io.onedev.server.model.User;import io.onedev.server.notification.ActivityDetail;@@ -57,10 +59,11 @@ public class IssueOwnSpentTimeChangeData extends IssueChangeData {@Overridepublic ActivityDetail getActivityDetail() {+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();Map<String, String> oldFieldValues = new HashMap<>();- oldFieldValues.put("Own Spent Time", DateUtils.formatWorkingPeriod(oldValue));+ oldFieldValues.put("Own Spent Time", timeTrackingSetting.formatWorkingPeriod(oldValue));Map<String, String> newFieldValues = new HashMap<>();- newFieldValues.put("Own Spent Time", DateUtils.formatWorkingPeriod(newValue));+ newFieldValues.put("Own Spent Time", timeTrackingSetting.formatWorkingPeriod(newValue));return ActivityDetail.compare(oldFieldValues, newFieldValues, true);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalEstimatedTimeChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalEstimatedTimeChangeData.javaindex e31fff457d..d2870ca9ff 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalEstimatedTimeChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalEstimatedTimeChangeData.java@@ -1,5 +1,7 @@package io.onedev.server.model.support.issue.changedata;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Group;import io.onedev.server.model.User;import io.onedev.server.notification.ActivityDetail;@@ -49,10 +51,11 @@ public class IssueTotalEstimatedTimeChangeData extends IssueChangeData {@Overridepublic ActivityDetail getActivityDetail() {+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();Map<String, String> oldFieldValues = new HashMap<>();- oldFieldValues.put("Total Estimated Time", DateUtils.formatWorkingPeriod(oldValue));+ oldFieldValues.put("Total Estimated Time", timeTrackingSetting.formatWorkingPeriod(oldValue));Map<String, String> newFieldValues = new HashMap<>();- newFieldValues.put("Total Estimated Time", DateUtils.formatWorkingPeriod(newValue));+ newFieldValues.put("Total Estimated Time", timeTrackingSetting.formatWorkingPeriod(newValue));return ActivityDetail.compare(oldFieldValues, newFieldValues, true);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalSpentTimeChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalSpentTimeChangeData.javaindex a45d53281c..cb7a8bbc33 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalSpentTimeChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTotalSpentTimeChangeData.java@@ -1,9 +1,10 @@package io.onedev.server.model.support.issue.changedata;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Group;import io.onedev.server.model.User;import io.onedev.server.notification.ActivityDetail;-import io.onedev.server.util.DateUtils;import java.util.Collection;import java.util.HashMap;@@ -49,10 +50,11 @@ public class IssueTotalSpentTimeChangeData extends IssueChangeData {@Overridepublic ActivityDetail getActivityDetail() {+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();Map<String, String> oldFieldValues = new HashMap<>();- oldFieldValues.put("Total Spent Time", DateUtils.formatWorkingPeriod(oldValue));+ oldFieldValues.put("Total Spent Time", timeTrackingSetting.formatWorkingPeriod(oldValue));Map<String, String> newFieldValues = new HashMap<>();- newFieldValues.put("Total Spent Time", DateUtils.formatWorkingPeriod(newValue));+ newFieldValues.put("Total Spent Time", timeTrackingSetting.formatWorkingPeriod(newValue));return ActivityDetail.compare(oldFieldValues, newFieldValues, true);}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.javaindex 3e9f0f0db8..68a11f3221 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/spec/WorkingPeriodField.java@@ -5,8 +5,10 @@ import java.util.Map;import javax.validation.Valid;+import io.onedev.server.OneDev;import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.WorkingPeriodInput;import io.onedev.server.buildspecmodel.inputspec.workingperiodinput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.util.DateUtils;import io.onedev.server.annotation.Editable;@@ -50,10 +52,12 @@ public class WorkingPeriodField extends FieldSpec {@Overridepublic long getOrdinal(String fieldValue) {- if (fieldValue != null)- return DateUtils.parseWorkingPeriod(fieldValue);- else+ if (fieldValue != null) {+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();+ return timeTrackingSetting.parseWorkingPeriod(fieldValue);+ } else {return super.getOrdinal(fieldValue);+ }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex 0165ee7b60..2048068543 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -62,7 +62,8 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializapublic static int getWorkingPeriodValue(String value) {try {- return DateUtils.parseWorkingPeriod(value);+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();+ return timeTrackingSetting.parseWorkingPeriod(value);} catch (ValidationException e) {throw new ExplicitException("Invalid working period: " + value);}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.javaindex d2217fc34d..ff44adc926 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/EstimatedTimeCriteria.java@@ -1,7 +1,8 @@package io.onedev.server.search.entity.issue;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;-import io.onedev.server.util.DateUtils;import io.onedev.server.util.criteria.Criteria;import javax.persistence.criteria.*;@@ -50,9 +51,10 @@ public class EstimatedTimeCriteria extends Criteria<Issue> {@Overridepublic String toStringWithoutParens() {+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();return quote(NAME_ESTIMATED_TIME) + " "+ IssueQuery.getRuleName(operator) + " "- + quote(DateUtils.formatWorkingPeriod(value));+ + quote(timeTrackingSetting.formatWorkingPeriod(value));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 1d4177a5eb..6c0d5fc1e7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -32,7 +32,6 @@ import java.util.*;import static io.onedev.server.model.Issue.*;import static io.onedev.server.search.entity.issue.IssueQueryParser.*;-import static io.onedev.server.util.DateUtils.parseWorkingPeriod;public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue> {@@ -153,7 +152,7 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>int operator = ctx.operator.getType();if (validate)checkField(fieldName, operator, option);- if (fieldName.equals(Issue.NAME_PROJECT)) {+ if (fieldName.equals(NAME_PROJECT)) {return new ProjectIsCurrentCriteria();} else if (fieldName.equals(IssueSchedule.NAME_MILESTONE)) {return new MilestoneEmptyCriteria(operator);@@ -222,44 +221,46 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>if (validate)checkField(fieldName, operator, option);+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class)+ .getIssueSetting().getTimeTrackingSetting();switch (operator) {case IssueQueryLexer.IsUntil:case IssueQueryLexer.IsSince:- if (fieldName.equals(Issue.NAME_SUBMIT_DATE))+ if (fieldName.equals(NAME_SUBMIT_DATE))return new SubmitDateCriteria(value, operator);- else if (fieldName.equals(Issue.NAME_LAST_ACTIVITY_DATE))+ else if (fieldName.equals(NAME_LAST_ACTIVITY_DATE))return new LastActivityDateCriteria(value, operator);elsereturn new DateFieldCriteria(fieldName, value, operator);case IssueQueryLexer.Contains:- if (fieldName.equals(Issue.NAME_TITLE)) {+ if (fieldName.equals(NAME_TITLE)) {return new TitleCriteria(value);- } else if (fieldName.equals(Issue.NAME_DESCRIPTION)) {+ } else if (fieldName.equals(NAME_DESCRIPTION)) {return new DescriptionCriteria(value);- } else if (fieldName.equals(Issue.NAME_COMMENT)) {+ } else if (fieldName.equals(NAME_COMMENT)) {return new CommentCriteria(value);} else {return new StringFieldCriteria(fieldName, value, operator);}case IssueQueryLexer.Is:case IssueQueryLexer.IsNot:- if (fieldName.equals(Issue.NAME_PROJECT)) {+ if (fieldName.equals(NAME_PROJECT)) {return new ProjectCriteria(value, operator);} else if (fieldName.equals(IssueSchedule.NAME_MILESTONE)) {return new MilestoneCriteria(value, operator);- } else if (fieldName.equals(Issue.NAME_STATE)) {+ } else if (fieldName.equals(NAME_STATE)) {return new StateCriteria(value, operator);- } else if (fieldName.equals(Issue.NAME_VOTE_COUNT)) {+ } else if (fieldName.equals(NAME_VOTE_COUNT)) {return new VoteCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.NAME_COMMENT_COUNT)) {+ } else if (fieldName.equals(NAME_COMMENT_COUNT)) {return new CommentCountCriteria(getIntValue(value), operator);} else if (fieldName.equals(Issue.NAME_NUMBER)) {return new NumberCriteria(project, value, operator);- } else if (fieldName.equals(Issue.NAME_ESTIMATED_TIME)) {- int intValue = parseWorkingPeriod(value);+ } else if (fieldName.equals(NAME_ESTIMATED_TIME)) {+ int intValue = timeTrackingSetting.parseWorkingPeriod(value);return new EstimatedTimeCriteria(intValue, operator);- } else if (fieldName.equals(Issue.NAME_SPENT_TIME)) {- int intValue = parseWorkingPeriod(value);+ } else if (fieldName.equals(NAME_SPENT_TIME)) {+ int intValue = timeTrackingSetting.parseWorkingPeriod(value);return new SpentTimeCriteria(intValue, operator);} else {FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);@@ -287,19 +288,19 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>}case IssueQueryLexer.IsLessThan:case IssueQueryLexer.IsGreaterThan:- if (fieldName.equals(Issue.NAME_VOTE_COUNT)) {+ if (fieldName.equals(NAME_VOTE_COUNT)) {return new VoteCountCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.NAME_COMMENT_COUNT)) {+ } else if (fieldName.equals(NAME_COMMENT_COUNT)) {return new CommentCountCriteria(getIntValue(value), operator);} else if (fieldName.equals(Issue.NAME_NUMBER)) {return new NumberCriteria(project, value, operator);} else if (fieldName.equals(NAME_ESTIMATED_TIME)) {- int intValue = value.equals(NAME_SPENT_TIME)? -1: parseWorkingPeriod(value);+ int intValue = value.equals(NAME_SPENT_TIME)? -1: timeTrackingSetting.parseWorkingPeriod(value);return new EstimatedTimeCriteria(intValue, operator);} else if (fieldName.equals(NAME_SPENT_TIME)) {- int intValue = value.equals(NAME_ESTIMATED_TIME)? -1: parseWorkingPeriod(value);+ int intValue = value.equals(NAME_ESTIMATED_TIME)? -1: timeTrackingSetting.parseWorkingPeriod(value);return new SpentTimeCriteria(intValue, operator);- } else if (fieldName.equals(Issue.NAME_PROGRESS)) {+ } else if (fieldName.equals(NAME_PROGRESS)) {var floatValue = getFloatValue(value);return new ProgressCriteria(floatValue, operator);} else {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.javaindex d53d24345e..920002d8f4 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SpentTimeCriteria.java@@ -1,5 +1,7 @@package io.onedev.server.search.entity.issue;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.util.DateUtils;import io.onedev.server.util.criteria.Criteria;@@ -50,9 +52,10 @@ public class SpentTimeCriteria extends Criteria<Issue> {@Overridepublic String toStringWithoutParens() {+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();return quote(NAME_SPENT_TIME) + " "+ IssueQuery.getRuleName(operator) + " "- + quote(DateUtils.formatWorkingPeriod(value));+ + quote(timeTrackingSetting.formatWorkingPeriod(value));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/util/DateUtils.java b/server-core/src/main/java/io/onedev/server/util/DateUtils.javaindex 3906ccd0ff..d5c4e22eaa 100644--- a/server-core/src/main/java/io/onedev/server/util/DateUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/DateUtils.java@@ -4,20 +4,16 @@ import com.google.common.collect.Lists;import com.joestelmach.natty.DateGroup;import com.joestelmach.natty.Parser;import io.onedev.k8shelper.KubernetesHelper;-import org.apache.commons.lang3.StringUtils;import org.joda.time.DateTime;import org.joda.time.format.ISODateTimeFormat;import org.ocpsoft.prettytime.PrettyTime;import javax.annotation.Nullable;-import javax.validation.ValidationException;import java.time.LocalDate;import java.time.LocalDateTime;import java.time.ZoneId;import java.util.Date;import java.util.List;-import java.util.regex.Matcher;-import java.util.regex.Pattern;public class DateUtils extends org.apache.commons.lang3.time.DateUtils {@@ -27,11 +23,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {"2:30pm", "4-23", "2018-2-3", "one hour ago", "2 hours ago", "3PM", "noon", "today","yesterday", "yesterday midnight", "3 days ago", "last week", "last Monday","4 weeks ago", "last month", "1 month 2 days ago", "last year", "1 year ago");-- private static final Pattern WORKING_PERIOD_PATTERN = Pattern.compile("(\\d+w)?(\\d+d)?(\\d+h)?(\\d+m)?");-- public static final String WORKING_PERIOD_HELP = "Expects one or more <tt><number>(w|d|h|m)</tt>. " +- "For instance <tt>1w 1d 1h 1m</tt> represents 1 week (5 working days), 1 day (8 working hours), 1 hour, and 1 minute";public static String formatAge(Date date) {return PRETTY_TIME.format(date);@@ -67,64 +58,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {return ISODateTimeFormat.dateTime().print(date.getTime());}- public static int parseWorkingPeriod(String period) {- period = StringUtils.deleteWhitespace(period);- if (StringUtils.isBlank(period))- throw new ValidationException("Invalid working period");-- if (period.equals("0"))- return 0;-- Matcher matcher = WORKING_PERIOD_PATTERN.matcher(period);- if (!matcher.matches())- throw new ValidationException("Invalid working period");-- int minutes = 0;- if (matcher.group(1) != null) {- int weeks = Integer.parseInt(StringUtils.stripEnd(matcher.group(1), "w"));- minutes += weeks*5*8*60;- }-- if (matcher.group(2) != null) {- int days = Integer.parseInt(StringUtils.stripEnd(matcher.group(2), "d"));- minutes += days*8*60;- }-- if (matcher.group(3) != null) {- int hours = Integer.parseInt(StringUtils.stripEnd(matcher.group(3), "h"));- minutes += hours*60;- }-- if (matcher.group(4) != null)- minutes += Integer.parseInt(StringUtils.stripEnd(matcher.group(4), "m"));-- return minutes;- }-- public static String formatWorkingPeriod(int minutes) {- int weeks = minutes/(60*8*5);- minutes = minutes%(60*8*5);- int days = minutes/(60*8);- minutes = minutes%(60*8);- int hours = minutes/60;- minutes = minutes%60;-- StringBuilder builder = new StringBuilder();- if (weeks != 0)- builder.append(weeks).append("w ");- if (days != 0)- builder.append(days).append("d ");- if (hours != 0)- builder.append(hours).append("h ");- if (minutes != 0)- builder.append(minutes).append("m");-- String formatted = builder.toString().trim();- if (formatted.length() == 0)- formatted = "0m";- return formatted;- }-public static LocalDate toLocalDate(Date date) {return date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();}diff --git a/server-core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java b/server-core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.javaindex 2172fbc0ac..6e4487b550 100644--- a/server-core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java+++ b/server-core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java@@ -9,7 +9,7 @@ import org.apache.commons.lang3.StringUtils;public enum WhitespaceOption implements Function<String, String> {- DEFAULT() {+ IGNORE_TRAILING() {@Overridepublic String apply(String line) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/DiffOption.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/DiffOption.javaindex 37c9149882..92fa8985c1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/DiffOption.java+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/DiffOption.java@@ -15,7 +15,7 @@ public class DiffOption implements Serializable {private DiffViewMode viewMode = DiffViewMode.UNIFIED;- private WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;+ private WhitespaceOption whitespaceOption = WhitespaceOption.IGNORE_TRAILING;@Editable(order=100)@RadioChoicediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.javaindex 7d48437fd7..10bda55b8a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java@@ -2,6 +2,7 @@ package io.onedev.server.web.component.issue.activities.activity;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueWorkManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.IssueWork;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;@@ -26,7 +27,6 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import static io.onedev.server.util.DateUtils.formatDateTime;-import static io.onedev.server.util.DateUtils.formatWorkingPeriod;@SuppressWarnings("serial")class IssueWorkPanel extends GenericPanel<IssueWork> {@@ -57,7 +57,8 @@ class IssueWorkPanel extends GenericPanel<IssueWork> {private Component newDetailViewer(String componentId) {var fragment = new Fragment(componentId, "detailViewFrag", this);- fragment.add(new Label("workingPeriod", formatWorkingPeriod(getWork().getMinutes())));+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();+ fragment.add(new Label("workingPeriod", timeTrackingSetting.formatWorkingPeriod(getWork().getMinutes())));if (getWork().getNote() != null)fragment.add(new MarkdownViewer("note", Model.of(getWork().getNote()), null));elsediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/QueriedIssuesProgressPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/QueriedIssuesProgressPanel.javaindex 1b18a1d2eb..5d153e3e49 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/QueriedIssuesProgressPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/QueriedIssuesProgressPanel.java@@ -2,6 +2,7 @@ package io.onedev.server.web.component.issue.progress;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.IssueTimes;import io.onedev.server.util.ProjectScope;@@ -17,8 +18,6 @@ import org.apache.wicket.model.LoadableDetachableModel;import javax.annotation.Nullable;-import static io.onedev.server.util.DateUtils.formatWorkingPeriod;-public abstract class QueriedIssuesProgressPanel extends Panel {private final IModel<IssueTimes> timesModel = new LoadableDetachableModel<IssueTimes>() {@@ -49,9 +48,10 @@ public abstract class QueriedIssuesProgressPanel extends Panel {return timesModel.getObject().getSpentTime();}}));-- fragment.add(new Label("estimatedTime", formatWorkingPeriod(timesModel.getObject().getEstimatedTime())));- fragment.add(new Label("spentTime", formatWorkingPeriod(timesModel.getObject().getSpentTime())));++ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();+ fragment.add(new Label("estimatedTime", timeTrackingSetting.formatWorkingPeriod(timesModel.getObject().getEstimatedTime())));+ fragment.add(new Label("spentTime", timeTrackingSetting.formatWorkingPeriod(timesModel.getObject().getSpentTime())));add(fragment);} else {add(new Fragment("content", "noQueryFrag", this));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.javaindex ba40e6a178..10dbad162f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/progress/TimingDetailPanel.java@@ -25,8 +25,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import static io.onedev.server.util.DateUtils.formatWorkingPeriod;-abstract class TimingDetailPanel extends Panel {private Page page;@@ -45,42 +43,41 @@ abstract class TimingDetailPanel extends Panel {var timeAggregationLink = timeTrackingSetting.getAggregationLink();boolean timeAggregation = getIssue().isAggregatingTime(timeAggregationLink);-if (timeAggregation) {var fragment = new Fragment("content", "aggregationFrag", this);int estimatedTime = getIssue().getTotalEstimatedTime();- fragment.add(new Label("estimatedTime", formatWorkingPeriod(estimatedTime)));- fragment.add(new Label("ownEstimatedTime", formatWorkingPeriod(getIssue().getOwnEstimatedTime())));+ fragment.add(new Label("estimatedTime", timeTrackingSetting.formatWorkingPeriod(estimatedTime)));+ fragment.add(new Label("ownEstimatedTime", timeTrackingSetting.formatWorkingPeriod(getIssue().getOwnEstimatedTime())));fragment.add(newEstimatedTimeEditLink("editOwnEstimatedTime"));int aggregatedTime = getTimeTrackingManager().aggregateSourceLinkEstimatedTime(getIssue(), timeAggregationLink);aggregatedTime += getTimeTrackingManager().aggregateTargetLinkEstimatedTime(getIssue(), timeAggregationLink);fragment.add(new Label("estimatedTimeAggregationLink", timeAggregationLink));- fragment.add(new Label("aggregatedEstimatedTime", formatWorkingPeriod(aggregatedTime)));+ fragment.add(new Label("aggregatedEstimatedTime", timeTrackingSetting.formatWorkingPeriod(aggregatedTime)));int spentTime = getIssue().getTotalSpentTime();- fragment.add(new Label("spentTime", formatWorkingPeriod(spentTime)));- fragment.add(new Label("ownSpentTime", formatWorkingPeriod(getIssue().getOwnSpentTime())));+ fragment.add(new Label("spentTime", timeTrackingSetting.formatWorkingPeriod(spentTime)));+ fragment.add(new Label("ownSpentTime", timeTrackingSetting.formatWorkingPeriod(getIssue().getOwnSpentTime())));fragment.add(newLogWorkLink("logWork"));fragment.add(newStartWorkLink("startWork"));aggregatedTime = getTimeTrackingManager().aggregateSourceLinkSpentTime(getIssue(), timeAggregationLink);aggregatedTime += getTimeTrackingManager().aggregateTargetLinkSpentTime(getIssue(), timeAggregationLink);fragment.add(new Label("spentTimeAggregationLink", timeAggregationLink));- fragment.add(new Label("aggregatedSpentTime", formatWorkingPeriod(aggregatedTime)));+ fragment.add(new Label("aggregatedSpentTime", timeTrackingSetting.formatWorkingPeriod(aggregatedTime)));add(fragment);} else {var fragment = new Fragment("content", "noAggregationFrag", this);int estimatedTime = getIssue().getTotalEstimatedTime();- fragment.add(new Label("estimatedTime", formatWorkingPeriod(estimatedTime)));+ fragment.add(new Label("estimatedTime", timeTrackingSetting.formatWorkingPeriod(estimatedTime)));fragment.add(newEstimatedTimeEditLink("editEstimatedTime"));int spentTime = getIssue().getTotalSpentTime();- fragment.add(new Label("spentTime", formatWorkingPeriod(spentTime)));+ fragment.add(new Label("spentTime", timeTrackingSetting.formatWorkingPeriod(spentTime)));fragment.add(newLogWorkLink("logWork"));fragment.add(newStartWorkLink("startWork"));diff --git a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.javaindex 0c107cee9a..aa1defe82c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/EditableUtils.java@@ -1,19 +1,19 @@package io.onedev.server.web.editable;-import java.lang.reflect.AnnotatedElement;-import java.lang.reflect.Method;-import java.util.List;--import javax.annotation.Nullable;-+import io.onedev.server.OneDev;+import io.onedev.server.annotation.Editable;+import io.onedev.server.annotation.Interpolative;+import io.onedev.server.annotation.WorkingPeriod;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.util.BeanUtils;-import io.onedev.server.util.DateUtils;import io.onedev.server.util.ReflectionUtils;import io.onedev.server.util.interpolative.VariableInterpolator;-import io.onedev.server.annotation.Editable;-import io.onedev.server.annotation.Interpolative;-import io.onedev.server.annotation.WorkingPeriod;++import javax.annotation.Nullable;+import java.lang.reflect.AnnotatedElement;+import java.lang.reflect.Method;+import java.util.List;public class EditableUtils {@@ -97,13 +97,14 @@ public class EditableUtils {}return description;} else if (element.getAnnotation(WorkingPeriod.class) != null) {+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();String description = getDescription(element, editable);if (description.length() != 0) {if (!description.endsWith("."))description += ".";- description += " " + DateUtils.WORKING_PERIOD_HELP;+ description += " " + timeTrackingSetting.getWorkingPeriodHelp();} else {- description = DateUtils.WORKING_PERIOD_HELP;+ description = timeTrackingSetting.getWorkingPeriodHelp();}return description;} else {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodEditSupport.javaindex 9d18c002f3..88392b3d55 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodEditSupport.java@@ -1,20 +1,15 @@package io.onedev.server.web.editable.workingperiod;-import java.lang.reflect.AnnotatedElement;-import java.lang.reflect.Method;-+import io.onedev.server.OneDev;+import io.onedev.server.annotation.WorkingPeriod;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.web.editable.*;import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import io.onedev.server.util.DateUtils;-import io.onedev.server.web.editable.EditSupport;-import io.onedev.server.web.editable.EmptyValueLabel;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.editable.PropertyViewer;-import io.onedev.server.annotation.WorkingPeriod;+import java.lang.reflect.AnnotatedElement;+import java.lang.reflect.Method;@SuppressWarnings("serial")public class WorkingPeriodEditSupport implements EditSupport {@@ -34,7 +29,8 @@ public class WorkingPeriodEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null) {- return new Label(id, DateUtils.formatWorkingPeriod(model.getObject()));+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();+ return new Label(id, timeTrackingSetting.formatWorkingPeriod(model.getObject()));} else {return new EmptyValueLabel(id) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.javaindex f97723714a..826ba14b5a 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/workingperiod/WorkingPeriodPropertyEditor.java@@ -1,18 +1,19 @@package io.onedev.server.web.editable.workingperiod;-import javax.validation.ValidationException;-+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.issue.TimeTrackingSetting;+import io.onedev.server.web.behavior.OnTypingDoneBehavior;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;-import io.onedev.commons.utils.StringUtils;-import io.onedev.server.util.DateUtils;-import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.editable.PropertyDescriptor;-import io.onedev.server.web.editable.PropertyEditor;+import javax.validation.ValidationException;@SuppressWarnings("serial")public class WorkingPeriodPropertyEditor extends PropertyEditor<Integer> {@@ -28,8 +29,8 @@ public class WorkingPeriodPropertyEditor extends PropertyEditor<Integer> {super.onInitialize();String period;- if (getModelObject() != null)- period = DateUtils.formatWorkingPeriod(getModelObject()).toString();+ if (getModelObject() != null)+ period = getTimeTrackingSetting().formatWorkingPeriod(getModelObject()).toString();elseperiod = null;input = new TextField<>("input", Model.of(period));@@ -51,7 +52,7 @@ public class WorkingPeriodPropertyEditor extends PropertyEditor<Integer> {protected Integer convertInputToValue() throws ConversionException {if (StringUtils.isNotBlank(input.getConvertedInput())) {try {- return DateUtils.parseWorkingPeriod(input.getConvertedInput());+ return getTimeTrackingSetting().parseWorkingPeriod(input.getConvertedInput());} catch (ValidationException e) {throw new ConversionException(e.getMessage());}@@ -59,6 +60,10 @@ public class WorkingPeriodPropertyEditor extends PropertyEditor<Integer> {return null;}}++ private TimeTrackingSetting getTimeTrackingSetting() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();+ }@Overridepublic boolean needExplicitSubmit() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex 6c94d39019..c4dcc2f76a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -44,7 +44,6 @@ import org.apache.wicket.markup.html.panel.Panel;import org.eclipse.jgit.diff.DiffEntry;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;-import org.unbescape.javascript.JavaScriptEscape;import javax.annotation.Nullable;import java.util.*;@@ -365,7 +364,7 @@ public class CommitOptionPanel extends Panel {changeType = DiffEntry.ChangeType.DELETE;}- return new BlobChange(changeType, oldBlobIdent, newBlobIdent, WhitespaceOption.DEFAULT) {+ return new BlobChange(changeType, oldBlobIdent, newBlobIdent, WhitespaceOption.IGNORE_TRAILING) {@Overridepublic Project getProject() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 84b323bd9c..42e299f0a2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -142,7 +142,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annotastate.compareWith = params.get(PARAM_COMPARE_WITH).toString();state.whitespaceOption = WhitespaceOption.ofName(- params.get(PARAM_WHITESPACE_OPTION).toString(WhitespaceOption.DEFAULT.name()));+ params.get(PARAM_WHITESPACE_OPTION).toString(WhitespaceOption.IGNORE_TRAILING.name()));state.pathFilter = params.get(PARAM_PATH_FILTER).toString();state.blameFile = params.get(PARAM_BLAME_FILE).toString();state.currentFile = params.get(PARAM_CURRENT_FILE).toString();@@ -580,7 +580,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annotaparams.set(PARAM_COMMIT, state.revision);if (state.compareWith != null)params.set(PARAM_COMPARE_WITH, state.compareWith);- if (state.whitespaceOption != WhitespaceOption.DEFAULT)+ if (state.whitespaceOption != WhitespaceOption.IGNORE_TRAILING)params.set(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());if (state.pathFilter != null)params.set(PARAM_PATH_FILTER, state.pathFilter);@@ -627,7 +627,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota@Nullablepublic Long commentId;- public WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;+ public WhitespaceOption whitespaceOption = WhitespaceOption.IGNORE_TRAILING;@Nullablepublic String pathFilter;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 0b4812ddd9..0634d2969c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -153,7 +153,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Annelseparams.add(PARAM_RIGHT, state.rightSide.getProjectId());params.add(PARAM_COMPARE_WITH_MERGE_BASE, state.compareWithMergeBase);- if (state.whitespaceOption != WhitespaceOption.DEFAULT)+ if (state.whitespaceOption != WhitespaceOption.IGNORE_TRAILING)params.add(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());if (state.pathFilter != null)params.add(PARAM_PATH_FILTER, state.pathFilter);@@ -222,7 +222,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Annstate.currentFile = params.get(PARAM_CURRENT_FILE).toString();state.blameFile = params.get(PARAM_BLAME_FILE).toString();state.whitespaceOption = WhitespaceOption.ofName(- params.get(PARAM_WHITESPACE_OPTION).toString(WhitespaceOption.DEFAULT.name()));+ params.get(PARAM_WHITESPACE_OPTION).toString(WhitespaceOption.IGNORE_TRAILING.name()));state.commitQuery = params.get(PARAM_COMMIT_QUERY).toString();@@ -758,7 +758,7 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Annpublic boolean compareWithMergeBase = true;- public WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;+ public WhitespaceOption whitespaceOption = WhitespaceOption.IGNORE_TRAILING;@Nullablepublic TabPanel tabPanel;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 97739eb859..f6f9c0ce01 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -122,7 +122,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Annoprivate String blameFile;- private WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;+ private WhitespaceOption whitespaceOption = WhitespaceOption.IGNORE_TRAILING;public static PageParameters paramsOf(Project project, ProjectAndBranch target, ProjectAndBranch source) {PageParameters params = paramsOf(project);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex ece2ea0e83..bcf6a22447 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -172,7 +172,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Revstate.newCommitHash = request.getLatestUpdate().getHeadCommitHash();}if (state.whitespaceOption == null)- state.whitespaceOption = WhitespaceOption.DEFAULT;+ state.whitespaceOption = WhitespaceOption.IGNORE_TRAILING;}private int getCommitIndex(String commitHash) {@@ -220,10 +220,10 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements RevMap<Integer, Integer> lineMapping = lineMappingCache.get(key);if (lineMapping == null) {BlobIdent newBlobIdent = new BlobIdent(newCommitId.name(), blobPath, FileMode.REGULAR_FILE.getBits());- List<String> newLines = getProject().readLines(newBlobIdent, WhitespaceOption.DEFAULT, false);+ List<String> newLines = getProject().readLines(newBlobIdent, WhitespaceOption.IGNORE_TRAILING, false);if (newLines != null) {BlobIdent oldBlobIdent = new BlobIdent(oldCommitId.name(), blobPath, FileMode.REGULAR_FILE.getBits());- List<String> oldLines = getProject().readLines(oldBlobIdent, WhitespaceOption.DEFAULT, true);+ List<String> oldLines = getProject().readLines(oldBlobIdent, WhitespaceOption.IGNORE_TRAILING, true);if (oldLines != null)lineMapping = DiffUtils.mapLines(oldLines, newLines);else@@ -610,7 +610,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Revparams.add(PARAM_OLD_COMMIT, state.oldCommitHash);if (state.newCommitHash != null)params.add(PARAM_NEW_COMMIT, state.newCommitHash);- if (state.whitespaceOption != WhitespaceOption.DEFAULT)+ if (state.whitespaceOption != WhitespaceOption.IGNORE_TRAILING)params.add(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());if (state.pathFilter != null)params.add(PARAM_PATH_FILTER, state.pathFilter);@@ -892,7 +892,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Revpublic String createdCommitHash;- public WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;+ public WhitespaceOption whitespaceOption = WhitespaceOption.IGNORE_TRAILING;@Nullablepublic String pathFilter;diff --git a/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.java b/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.javanew file mode 100644index 0000000000..f20c2cfc8e--- /dev/null+++ b/server-core/src/test/java/io/onedev/server/model/support/issue/TimeTrackingSettingTest.java@@ -0,0 +1,26 @@+package io.onedev.server.model.support.issue;++import io.onedev.server.util.DateUtils;+import org.junit.Test;++import static org.junit.Assert.*;++public class TimeTrackingSettingTest {++ @Test+ public void test() {+ var timeTrackingSetting = new TimeTrackingSetting();+ assertEquals("4w 3d 6h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("4w 0d 30h")));+ assertEquals("4w 3d 6h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("4w 0d30h")));+ assertEquals("1w 3d 5h", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("8d 5h")));+ assertEquals("0m", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("0h")));+ assertEquals("0m", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("0m")));+ assertEquals("0m", timeTrackingSetting.formatWorkingPeriod(timeTrackingSetting.parseWorkingPeriod("0")));+ try {+ timeTrackingSetting.parseWorkingPeriod("abc");+ assertTrue(false);+ } catch (Exception e) {+ }+ }++}\ No newline at end of filediff --git a/server-core/src/test/java/io/onedev/server/util/DateUtilsTest.java b/server-core/src/test/java/io/onedev/server/util/DateUtilsTest.javadeleted file mode 100644index ac77658e1d..0000000000--- a/server-core/src/test/java/io/onedev/server/util/DateUtilsTest.java+++ /dev/null@@ -1,24 +0,0 @@-package io.onedev.server.util;--import static org.junit.Assert.*;--import org.junit.Test;--public class DateUtilsTest {-- @Test- public void test() {- assertEquals("4w 3d 6h", DateUtils.formatWorkingPeriod(DateUtils.parseWorkingPeriod("4w 0d 30h")));- assertEquals("4w 3d 6h", DateUtils.formatWorkingPeriod(DateUtils.parseWorkingPeriod("4w 0d30h")));- assertEquals("1w 3d 5h", DateUtils.formatWorkingPeriod(DateUtils.parseWorkingPeriod("8d 5h")));- assertEquals("0m", DateUtils.formatWorkingPeriod(DateUtils.parseWorkingPeriod("0h")));- assertEquals("0m", DateUtils.formatWorkingPeriod(DateUtils.parseWorkingPeriod("0m")));- assertEquals("0m", DateUtils.formatWorkingPeriod(DateUtils.parseWorkingPeriod("0")));- try {- DateUtils.parseWorkingPeriod("abc");- assertTrue(false);- } catch (Exception e) {- }- }--}diff --git a/server-ee b/server-eeindex 19ae2461eb..d0a73a3365 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 19ae2461ebf840b56043b051e73e504880b0dbd9+Subproject commit d0a73a3365278373cbab1980dc1d734f19bf025ediff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.javaindex bb4e357934..254359a800 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java@@ -11,12 +11,12 @@ import io.onedev.server.annotation.ClassValidating;import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Password;import io.onedev.server.attachment.AttachmentManager;+import io.onedev.server.attachment.AttachmentTooLargeException;import io.onedev.server.buildspecmodel.inputspec.InputSpec;import io.onedev.server.entitymanager.*;import io.onedev.server.entityreference.ReferenceMigrator;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.project.issue.IssuesImported;-import io.onedev.server.attachment.AttachmentTooLargeException;import io.onedev.server.git.command.LsRemoteCommand;import io.onedev.server.model.*;import io.onedev.server.model.support.LastActivity;@@ -26,7 +26,6 @@ import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.CollectionUtils;-import io.onedev.server.util.DateUtils;import io.onedev.server.util.JerseyUtils;import io.onedev.server.util.JerseyUtils.PageDataConsumer;import io.onedev.server.util.Pair;@@ -384,9 +383,9 @@ public class ImportServer implements Serializable, Validatable {milestoneMappings.put(milestone.getName(), milestone);String initialIssueState = getIssueSetting().getInitialStateSpec().getName();+ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();List<Issue> issues = new ArrayList<>();-Map<Long, Long> issueNumberMappings = new HashMap<>();AtomicInteger numOfImportedIssues = new AtomicInteger(0);@@ -546,7 +545,7 @@ public class ImportServer implements Serializable, Validatable {issueField.setIssue(issue);issueField.setName(option.getEstimatedTimeIssueField());issueField.setType(InputSpec.WORKING_PERIOD);- issueField.setValue(DateUtils.formatWorkingPeriod(value/60));+ issueField.setValue(timeTrackingSetting.formatWorkingPeriod(value/60));issue.getFields().add(issueField);}}@@ -557,7 +556,7 @@ public class ImportServer implements Serializable, Validatable {issueField.setIssue(issue);issueField.setName(option.getSpentTimeIssueField());issueField.setType(InputSpec.WORKING_PERIOD);- issueField.setValue(DateUtils.formatWorkingPeriod(value/60));+ issueField.setValue(timeTrackingSetting.formatWorkingPeriod(value/60));issue.getFields().add(issueField);}}diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.javaindex 9a7e11256a..417041d3b0 100644--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportServer.java@@ -446,6 +446,8 @@ public class ImportServer implements Serializable, Validatable {apiEndpoint = getApiEndpoint("/issuetype/project?projectId=" + jiraProject.get("id").asText());for (JsonNode typeNode: list(client, apiEndpoint, logger))untranslatedTypeNames.put(typeNode.get("id").asText(), typeNode.get("untranslatedName").asText());++ var timeTrackingSetting = OneDev.getInstance(SettingManager.class).getIssueSetting().getTimeTrackingSetting();AtomicInteger numOfImportedIssues = new AtomicInteger(0);PageDataConsumer pageDataConsumer = new PageDataConsumer() {@@ -647,7 +649,7 @@ public class ImportServer implements Serializable, Validatable {issueField.setIssue(issue);issueField.setName(option.getTimeEstimateIssueField());issueField.setType(InputSpec.WORKING_PERIOD);- issueField.setValue(DateUtils.formatWorkingPeriod(Integer.valueOf(timeEstimate)/60));+ issueField.setValue(timeTrackingSetting.formatWorkingPeriod(Integer.valueOf(timeEstimate)/60));issue.getFields().add(issueField);}}@@ -658,7 +660,7 @@ public class ImportServer implements Serializable, Validatable {issueField.setIssue(issue);issueField.setName(option.getTimeSpentIssueField());issueField.setType(InputSpec.WORKING_PERIOD);- issueField.setValue(DateUtils.formatWorkingPeriod(Integer.valueOf(timeSpent)/60));+ issueField.setValue(timeTrackingSetting.formatWorkingPeriod(Integer.valueOf(timeSpent)/60));issue.getFields().add(issueField);}}