The Unified and Autonomous Development Platform
Able to display build params on build list
Robin Shendecd0ea22eb9
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 08d7cb7daa..77476d3b03 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -192,6 +192,8 @@ public class Build extends AbstractEntity implements Referenceable {private transient Job job;+ private transient Map<String, Input> paramInputs;+private transient Map<Build.Status, Build> streamPreviousCache = new HashMap<>();private transient Map<Integer, Collection<Long>> numbersOfStreamPreviousCache = new HashMap<>();@@ -451,41 +453,42 @@ public class Build extends AbstractEntity implements Referenceable {}public Map<String, Input> getParamInputs() {- Map<String, Input> inputs = new LinkedHashMap<>();-- Map<String, List<BuildParam>> paramMap = new HashMap<>();- for (BuildParam param: getParams()) {- List<BuildParam> paramsOfName = paramMap.get(param.getName());- if (paramsOfName == null) {- paramsOfName = new ArrayList<>();- paramMap.put(param.getName(), paramsOfName);- }- paramsOfName.add(param);- }- for (ParamSpec paramSpec: getJob().getParamSpecs()) {- String paramName = paramSpec.getName();- List<BuildParam> params = paramMap.get(paramName);- if (params != null) {- String type = params.iterator().next().getType();- List<String> values = new ArrayList<>();- for (BuildParam param: params) {- if (param.getValue() != null)- values.add(param.getValue());+ if (paramInputs == null) {+ paramInputs = new LinkedHashMap<>();+ Map<String, List<BuildParam>> paramMap = new HashMap<>();+ for (BuildParam param: getParams()) {+ List<BuildParam> paramsOfName = paramMap.get(param.getName());+ if (paramsOfName == null) {+ paramsOfName = new ArrayList<>();+ paramMap.put(param.getName(), paramsOfName);}- Collections.sort(values, new Comparator<String>() {-- @Override- public int compare(String o1, String o2) {- return (int) (paramSpec.getOrdinal(o1) - paramSpec.getOrdinal(o2));- }-- });- if (!paramSpec.isAllowMultiple() && values.size() > 1)- values = Lists.newArrayList(values.iterator().next());- inputs.put(paramName, new Input(paramName, type, values));+ paramsOfName.add(param);}+ for (ParamSpec paramSpec: getJob().getParamSpecs()) {+ String paramName = paramSpec.getName();+ List<BuildParam> params = paramMap.get(paramName);+ if (params != null) {+ String type = params.iterator().next().getType();+ List<String> values = new ArrayList<>();+ for (BuildParam param: params) {+ if (param.getValue() != null)+ values.add(param.getValue());+ }+ Collections.sort(values, new Comparator<String>() {++ @Override+ public int compare(String o1, String o2) {+ return (int) (paramSpec.getOrdinal(o1) - paramSpec.getOrdinal(o2));+ }++ });+ if (!paramSpec.isAllowMultiple() && values.size() > 1)+ values = Lists.newArrayList(values.iterator().next());+ paramInputs.put(paramName, new Input(paramName, type, values));+ }+ }}- return inputs;+ return paramInputs;}public BuildFacade getFacade() {@@ -516,21 +519,25 @@ public class Build extends AbstractEntity implements Referenceable {if (!checkedParamNames.add(paramName))return false;- ParamSpec paramSpec = Preconditions.checkNotNull(getJob().getParamSpecMap().get(paramName));- if (paramSpec.getShowCondition() != null) {- Input dependentInput = getParamInputs().get(paramSpec.getShowCondition().getInputName());- Preconditions.checkNotNull(dependentInput);- String value;- if (!dependentInput.getValues().isEmpty())- value = dependentInput.getValues().iterator().next();- else- value = null;- if (paramSpec.getShowCondition().getValueMatcher().matches(value))- return isParamVisible(dependentInput.getName(), checkedParamNames);- else- return false;+ ParamSpec paramSpec = getJob().getParamSpecMap().get(paramName);+ if (paramSpec != null) {+ if (paramSpec.getShowCondition() != null) {+ Input dependentInput = getParamInputs().get(paramSpec.getShowCondition().getInputName());+ Preconditions.checkNotNull(dependentInput);+ String value;+ if (!dependentInput.getValues().isEmpty())+ value = dependentInput.getValues().iterator().next();+ else+ value = null;+ if (paramSpec.getShowCondition().getValueMatcher().matches(value))+ return isParamVisible(dependentInput.getName(), checkedParamNames);+ else+ return false;+ } else {+ return true;+ }} else {- return true;+ return false;}}diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex e2bbd8cb86..3d41aff134 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -135,6 +135,8 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStprivate transient List<RevCommit> commits;+ private transient Map<String, Input> fieldInputs;+public long getVersion() {return version;}@@ -314,41 +316,43 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt}public Map<String, Input> getFieldInputs() {- Map<String, Input> inputs = new LinkedHashMap<>();-- Map<String, List<IssueField>> fieldMap = new HashMap<>();- for (IssueField field: getFields()) {- List<IssueField> fieldsOfName = fieldMap.get(field.getName());- if (fieldsOfName == null) {- fieldsOfName = new ArrayList<>();- fieldMap.put(field.getName(), fieldsOfName);- }- fieldsOfName.add(field);- }- for (FieldSpec fieldSpec: getIssueSetting().getFieldSpecs()) {- String fieldName = fieldSpec.getName();- List<IssueField> fields = fieldMap.get(fieldName);- if (fields != null) {- String type = fields.iterator().next().getType();- List<String> values = new ArrayList<>();- for (IssueField field: fields) {- if (field.getValue() != null)- values.add(field.getValue());+ if (fieldInputs == null) {+ fieldInputs = new LinkedHashMap<>();++ Map<String, List<IssueField>> fieldMap = new HashMap<>();+ for (IssueField field: getFields()) {+ List<IssueField> fieldsOfName = fieldMap.get(field.getName());+ if (fieldsOfName == null) {+ fieldsOfName = new ArrayList<>();+ fieldMap.put(field.getName(), fieldsOfName);}- Collections.sort(values, new Comparator<String>() {-- @Override- public int compare(String o1, String o2) {- return (int) (fieldSpec.getOrdinal(o1) - fieldSpec.getOrdinal(o2));+ fieldsOfName.add(field);+ }+ for (FieldSpec fieldSpec: getIssueSetting().getFieldSpecs()) {+ String fieldName = fieldSpec.getName();+ List<IssueField> fields = fieldMap.get(fieldName);+ if (fields != null) {+ String type = fields.iterator().next().getType();+ List<String> values = new ArrayList<>();+ for (IssueField field: fields) {+ if (field.getValue() != null)+ values.add(field.getValue());}-- });- if (!fieldSpec.isAllowMultiple() && values.size() > 1)- values = Lists.newArrayList(values.iterator().next());- inputs.put(fieldName, new Input(fieldName, type, values));+ Collections.sort(values, new Comparator<String>() {++ @Override+ public int compare(String o1, String o2) {+ return (int) (fieldSpec.getOrdinal(o1) - fieldSpec.getOrdinal(o2));+ }++ });+ if (!fieldSpec.isAllowMultiple() && values.size() > 1)+ values = Lists.newArrayList(values.iterator().next());+ fieldInputs.put(fieldName, new Input(fieldName, type, values));+ }}}- return inputs;+ return fieldInputs;}public static String getWebSocketObservable(Long issueId) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.javaindex 41c71c49b7..7d2f956d3b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java@@ -19,6 +19,8 @@ public class ProjectBuildSetting implements Serializable {private static final long serialVersionUID = 1L;+ private List<String> listParams;+private List<NamedBuildQuery> namedQueries;private transient GlobalBuildSetting setting;@@ -43,6 +45,18 @@ public class ProjectBuildSetting implements Serializable {return setting;}+ @Nullable+ public List<String> getListParams(boolean useDefaultIfNotDefined) {+ if (useDefaultIfNotDefined && listParams == null)+ return new ArrayList<>(getGlobalSetting().getListParams());+ else+ return listParams;+ }++ public void setListParams(@Nullable List<String> listParams) {+ this.listParams = listParams;+ }+@Nullablepublic List<NamedBuildQuery> getNamedQueries(boolean useDefaultIfNotDefined) {if (useDefaultIfNotDefined && namedQueries == null)diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.javaindex 4c91cd13dc..ef2dc35db5 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java@@ -14,6 +14,8 @@ public class GlobalBuildSetting implements Serializable {private List<NamedBuildQuery> namedQueries = new ArrayList<>();+ private List<String> listParams = new ArrayList<>();+public GlobalBuildSetting() {namedQueries.add(new NamedBuildQuery("All", "all"));namedQueries.add(new NamedBuildQuery("Successful", "successful"));@@ -35,6 +37,14 @@ public class GlobalBuildSetting implements Serializable {this.namedQueries = namedQueries;}+ public List<String> getListParams() {+ return listParams;+ }++ public void setListParams(List<String> listParams) {+ this.listParams = listParams;+ }+@Nullablepublic NamedBuildQuery getNamedQuery(String name) {for (NamedBuildQuery namedQuery: getNamedQueries()) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex 7170b80e9d..a826e15c3c 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -57,7 +57,7 @@ public class GlobalIssueSetting implements Serializable {private List<BoardSpec> defaultBoardSpecs = new ArrayList<>();- private Collection<String> listFields = new HashSet<>();+ private List<String> listFields = new ArrayList<>();private List<NamedIssueQuery> namedQueries = new ArrayList<>();@@ -552,11 +552,11 @@ public class GlobalIssueSetting implements Serializable {this.defaultBoardSpecs = defaultBoardSpecs;}- public Collection<String> getListFields() {+ public List<String> getListFields() {return listFields;}- public void setListFields(Collection<String> listFields) {+ public void setListFields(List<String> listFields) {this.listFields = listFields;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.javaindex f6c16f61e5..84aaeebe90 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java@@ -33,7 +33,7 @@ public class ProjectIssueSetting implements Serializable {private Collection<String> promptFieldsUponIssueOpen;- private Collection<String> listFields;+ private List<String> listFields;private List<BoardSpec> boardSpecs;@@ -72,14 +72,14 @@ public class ProjectIssueSetting implements Serializable {}@Nullable- public Collection<String> getListFields(boolean useDefaultIfNotDefined) {+ public List<String> getListFields(boolean useDefaultIfNotDefined) {if (useDefaultIfNotDefined && listFields == null)- return new HashSet<>(getGlobalSetting().getListFields());+ return new ArrayList<>(getGlobalSetting().getListFields());elsereturn listFields;}- public void setListFields(@Nullable Collection<String> listFields) {+ public void setListFields(@Nullable List<String> listFields) {this.listFields = listFields;}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex 9913a776d0..d5ee0db823 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -99,10 +99,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);return !suggestions.isEmpty()? suggestions: null;} else if (fieldName.equals(BuildConstants.FIELD_JOB)) {- if (project != null)- return SuggestionUtils.suggestJobs(project, matchWith);- else- return null;+ return SuggestionUtils.suggestJobs(project, matchWith);} else if (fieldName.equals(BuildConstants.FIELD_NUMBER)) {return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex 3285ca3299..306ef4b9ef 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -12,6 +12,7 @@<div wicket:id="others" class="others"><a wicket:id="showSavedQueries" class="show-saved-queries"><i class="fa fa-eye"></i> Show Saved Queries</a><a wicket:id="saveQuery" class="save-query"><i class="fa fa-save"></i> Save Query</a>+ <a wicket:id="listParams" class="list-params"><i class="fa fa-list-ul"></i> Display Params</a></div></div><div wicket:id="body" class="body">@@ -29,4 +30,24 @@<a wicket:id="hashLink" class="hash"><span wicket:id="hash"></span></a><a wicket:id="copyHash"><i class="fa fa-clipboard"></i></a></wicket:fragment>+ <wicket:fragment wicket:id="listParamsFrag">+ <div class="build-list-params">+ <form wicket:id="form">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Params to Display+ </h4>+ </div>+ <div class="modal-body">+ <input wicket:id="params" type="hidden" class="form-control">+ </div>+ <div class="modal-footer clearfix">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">+ <a wicket:id="useDefault" class="btn btn-primary">Use Default</a>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+ </div>+ </wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 0c97c21f25..cf8ece54ee 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -3,10 +3,13 @@ package io.onedev.server.web.component.build.list;import java.util.ArrayList;import java.util.Collection;import java.util.Iterator;+import java.util.LinkedHashMap;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.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -46,29 +49,38 @@ import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.buildspec.job.paramspec.ParamSpec;import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.BuildParamManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;import io.onedev.server.model.Project;+import io.onedev.server.model.support.administration.GlobalBuildSetting;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.util.BuildConstants;-import io.onedev.server.util.DateUtils;+import io.onedev.server.util.Input;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.BuildQueryBehavior;import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;+import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.component.datatable.DefaultDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.job.JobDefLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;+import io.onedev.server.web.component.stringchoice.StringMultiChoice;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;-import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QuerySaveSupport;@@ -154,6 +166,10 @@ public abstract class BuildListPanel extends Panel {}}+ private GlobalBuildSetting getGlobalBuildSetting() {+ return OneDev.getInstance(SettingManager.class).getBuildSetting();+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -212,6 +228,104 @@ public abstract class BuildListPanel extends Panel {});+ others.add(new ModalLink("listParams") {++ private List<String> listParams;++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ Fragment fragment = new Fragment(id, "listParamsFrag", BuildListPanel.this);+ Form<?> form = new Form<Void>("form");+ listParams = getListParams();+ form.add(new StringMultiChoice("params", new IModel<Collection<String>>() {++ @Override+ public void detach() {+ }++ @Override+ public Collection<String> getObject() {+ return listParams;+ }++ @Override+ public void setObject(Collection<String> object) {+ listParams = new ArrayList<>(object);+ }++ }, new LoadableDetachableModel<Map<String, String>>() {++ @Override+ protected Map<String, String> load() {+ Map<String, String> choices = new LinkedHashMap<>();+ for (String fieldName: OneDev.getInstance(BuildParamManager.class).getBuildParamNames())+ choices.put(fieldName, fieldName);+ return choices;+ }++ }));++ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ modal.close();+ }++ });++ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ modal.close();+ if (getProject() != null) {+ getProject().getBuildSetting().setListParams(listParams);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ } else {+ getGlobalBuildSetting().setListParams(listParams);+ OneDev.getInstance(SettingManager.class).saveBuildSetting(getGlobalBuildSetting());+ }+ onQueryUpdated(target, query);+ }++ });++ form.add(new AjaxLink<Void>("useDefault") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ modal.close();+ getProject().getBuildSetting().setListParams(null);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ onQueryUpdated(target, query);+ }++ }.setVisible(getProject() != null && getProject().getBuildSetting().getListParams(false) != null));++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ modal.close();+ }++ });++ fragment.add(form);++ return fragment;+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator() || getProject() != null && SecurityUtils.canManage(getProject()));+ }++ });+TextField<String> input = new TextField<String>("input", new PropertyModel<String>(this, "query"));input.add(new BuildQueryBehavior(new AbstractReadOnlyModel<Project>() {@@ -308,7 +422,10 @@ public abstract class BuildListPanel extends Panel {@Overridepublic String getObject() {Build build = rowModel.getObject();- StringBuilder builder = new StringBuilder("#" + build.getNumber());+ StringBuilder builder = new StringBuilder();+ if (getProject() == null)+ builder.append(build.getProject().getName());+ builder.append("#" + build.getNumber());if (build.getVersion() != null)builder.append(" (" + build.getVersion() + ")");return builder.toString();@@ -383,29 +500,6 @@ public abstract class BuildListPanel extends Panel {}});- if (getProject() == null) {- columns.add(new AbstractColumn<Build, Void>(Model.of("Project")) {-- @Override- public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,- IModel<Build> rowModel) {- Build build = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);- Link<Void> link = new BookmarkablePageLink<Void>("link", ProjectDashboardPage.class,- ProjectDashboardPage.paramsOf(build.getProject()));- link.add(new Label("label", build.getProject()));- fragment.add(link);- cellItem.add(fragment);- }-- @Override- public String getCssClass() {- return "project";- }-- });- }-columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_JOB)) {@Override@@ -463,24 +557,47 @@ public abstract class BuildListPanel extends Panel {}});- columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_SUBMIT_DATE)) {+ for (String param: getListParams()) {+ columns.add(new AbstractColumn<Build, Void>(Model.of(param)) {- @Override- public String getCssClass() {- return "date expanded";- }+ @Override+ public String getCssClass() {+ return "param expanded";+ }- @Override- public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,- IModel<Build> rowModel) {- cellItem.add(new Label(componentId, DateUtils.formatAge(rowModel.getObject().getSubmitDate())));- }- });+ @Override+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,+ IModel<Build> rowModel) {+ Build build = rowModel.getObject();+ if (build.isParamVisible(param)) {+ Input input = build.getParamInputs().get(param);+ if (input != null) {+ if (input.getType().equals(ParamSpec.SECRET))+ cellItem.add(new Label(componentId, SecretInput.MASK));+ else+ cellItem.add(new MultilineLabel(componentId, StringUtils.join(input.getValues(), ",")));+ } else {+ cellItem.add(new Label(componentId, "<i>Undefined</i>").setEscapeModelStrings(false));+ }+ } else {+ cellItem.add(new Label(componentId, "<i>Undefined</i>").setEscapeModelStrings(false));+ }+ }++ });+ }body.add(buildsTable = new DefaultDataTable<Build, Void>("builds", columns, dataProvider,WebConstants.PAGE_SIZE, getPagingHistorySupport()));}+ private List<String> getListParams() {+ if (getProject() != null)+ return getProject().getBuildSetting().getListParams(true);+ else+ return getGlobalBuildSetting().getListParams();+ }+private WebSocketObserver newBuildObserver(Long buildId) {return new WebSocketObserver() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.cssindex 9d799f42eb..7d59f723f3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/field-values.css@@ -1,3 +1,6 @@.field-values>.value {margin-right: 0 !important;+}+.field-values>i {+ font-size: 13px;}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 7ca60428a6..85ef944a6a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -2,7 +2,6 @@ package io.onedev.server.web.component.issue.list;import java.util.ArrayList;import java.util.Collection;-import java.util.HashSet;import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;@@ -158,7 +157,7 @@ public abstract class IssueListPanel extends Panel {return null;}- private GlobalIssueSetting getIssueSetting() {+ private GlobalIssueSetting getGlobalIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}@@ -259,13 +258,13 @@ public abstract class IssueListPanel extends Panel {others.add(new ModalLink("listFields") {- private Collection<String> fieldSet;+ private List<String> listFields;@Overrideprotected Component newContent(String id, ModalPanel modal) {Fragment fragment = new Fragment(id, "listFieldsFrag", IssueListPanel.this);Form<?> form = new Form<Void>("form");- fieldSet = getListFields();+ listFields = getListFields();form.add(new StringMultiChoice("fields", new IModel<Collection<String>>() {@Override@@ -274,12 +273,12 @@ public abstract class IssueListPanel extends Panel {@Overridepublic Collection<String> getObject() {- return fieldSet;+ return listFields;}@Overridepublic void setObject(Collection<String> object) {- fieldSet = new HashSet<>(object);+ listFields = new ArrayList<>(object);}}, new LoadableDetachableModel<Map<String, String>>() {@@ -287,7 +286,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected Map<String, String> load() {Map<String, String> choices = new LinkedHashMap<>();- for (String fieldName: getIssueSetting().getFieldNames())+ for (String fieldName: getGlobalIssueSetting().getFieldNames())choices.put(fieldName, fieldName);return choices;}@@ -310,11 +309,11 @@ public abstract class IssueListPanel extends Panel {super.onSubmit(target, form);modal.close();if (getProject() != null) {- getProject().getIssueSetting().setListFields(fieldSet);+ getProject().getIssueSetting().setListFields(listFields);OneDev.getInstance(ProjectManager.class).save(getProject());} else {- getIssueSetting().setListFields(fieldSet);- OneDev.getInstance(SettingManager.class).saveIssueSetting(getIssueSetting());+ getGlobalIssueSetting().setListFields(listFields);+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getGlobalIssueSetting());}onQueryUpdated(target, query);}@@ -594,7 +593,7 @@ public abstract class IssueListPanel extends Panel {fragment.add(new IssueStateLabel("state", rowModel));RepeatingView fieldsView = new RepeatingView("fields");- for (String field: getIssueSetting().sortFieldNames(getListFields())) {+ for (String field: getListFields()) {fieldsView.add(new FieldValuesPanel(fieldsView.newChildId()) {@Override@@ -650,11 +649,11 @@ public abstract class IssueListPanel extends Panel {issuesTable.addBottomToolbar(new NoRecordsToolbar(issuesTable));}- private Collection<String> getListFields() {+ private List<String> getListFields() {if (getProject() != null)return getProject().getIssueSetting().getListFields(true);else- return getIssueSetting().getListFields();+ return getGlobalIssueSetting().getListFields();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.cssindex e35044de77..63757ee523 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css@@ -50,6 +50,7 @@}.issue-list>.body td .submission, .issue-list>.body td .comments, .issue-list>.body td .votes {color: #888;+ font-size: 13px;}.issue-list>.body td .votes {margin-right: 8px;diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.cssindex 436bb723cd..b698e023ee 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css@@ -56,6 +56,7 @@.pull-request-list>.body td .submission,.pull-request-list>.body td .comments {color: #888;+ font-size: 13px;}.pull-request-list>.body .new-indicator {diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 08e6da3c94..5de7d16027 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -318,28 +318,20 @@ public class SuggestionUtils {}public static List<InputSuggestion> suggestJobs(@Nullable Project project, String matchWith) {- return suggest(project, matchWith, new ProjectScopedSuggester() {-- @Override- public void fillSuggestions(List<InputSuggestion> suggestions, Project project,- @Nullable User user, String matchWith, boolean prependProject) {- BuildManager buildManager = OneDev.getInstance(BuildManager.class);- Collection<String> jobNames = buildManager.getAccessibleJobNames(project, user).get(project);- for (String jobName: jobNames) {- LinearRange match = LinearRange.match(jobName, matchWith);- if (match != null) {- if (prependProject) {- int length = project.getName().length() + 1;- suggestions.add(new InputSuggestion(project.getName() + ":" + jobName, null,- new LinearRange(match.getFrom() + length, match.getTo() + length)));- } else {- suggestions.add(new InputSuggestion(jobName, null, match));- }- }- }- }-- }, ":");+ Collection<String> jobNames;+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);+ if (project != null)+ jobNames = buildManager.getAccessibleJobNames(project, SecurityUtils.getUser()).get(project);+ else+ jobNames = buildManager.getJobNames();++ List<InputSuggestion> suggestions = new ArrayList<>();+ for (String jobName: jobNames) {+ LinearRange match = LinearRange.match(jobName, matchWith);+ if (match != null)+ suggestions.add(new InputSuggestion(jobName, null, match));+ }+ return suggestions;}public static List<InputSuggestion> suggestMilestones(@Nullable Project project, String matchWith) {