The Unified and Autonomous Development Platform
Add issues via issue board
robin shen4cb15869b0e6
diff --git a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.javaindex 489c633285..2d7972ec38 100644--- a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java@@ -3,7 +3,6 @@ package io.onedev.server.manager;import java.io.Serializable;import java.util.Collection;import java.util.Iterator;-import java.util.Set;import javax.annotation.Nullable;@@ -27,7 +26,8 @@ public interface IssueChangeManager extends EntityManager<IssueChange> {void changeState(Issue issue, String state, Serializable fieldBean, Collection<String> fieldNames,@Nullable String comment);- void batchUpdate(Iterator<? extends Issue> issues, @Nullable String state, @Nullable Optional<Milestone> milestone,- Serializable fieldBean, Set<String> fieldNames, @Nullable String comment);+ void batchUpdate(Iterator<? extends Issue> issues, @Nullable String state,+ @Nullable Optional<Milestone> milestone, Serializable fieldBean,+ Collection<String> fieldNames, @Nullable String comment);}diff --git a/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java b/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.javaindex b7fc47230e..d3dba804bb 100644--- a/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java@@ -1,29 +1,14 @@package io.onedev.server.manager;-import java.io.Serializable;-import java.util.Collection;import java.util.List;-import java.util.Set;--import javax.annotation.Nullable;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;-import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.EntityManager;public interface IssueFieldUnaryManager extends EntityManager<IssueFieldUnary> {-- Class<? extends Serializable> defineFieldBeanClass(Project project, boolean setDefaultValue);-- @Nullable- Class<? extends Serializable> loadFieldBeanClass(String className, boolean setDefaultValue);-- Serializable readFields(Issue issue);-- void writeFields(Issue issue, Serializable fieldBean, Collection<String> fieldNames);- Set<String> getExcludedProperties(Issue issue, String state);+ void writeFields(Issue issue);void onRenameUser(String oldName, String newName);diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.javaindex 8c5597e3d3..b2a6e7e132 100644--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java@@ -1,6 +1,5 @@package io.onedev.server.manager;-import java.io.Serializable;import java.util.Collection;import java.util.List;import java.util.Map;@@ -24,7 +23,7 @@ public interface IssueManager extends EntityManager<Issue> {@NullableIssue find(Project target, long number);- void open(Issue issue, Serializable fieldBean);+ void open(Issue issue);List<Issue> query(Project project, IssueQuery issueQuery, int firstResult, int maxResults);diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.javaindex 4b3c6f008c..c4cbfdc194 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java@@ -5,7 +5,6 @@ import java.util.Collection;import java.util.Date;import java.util.Iterator;import java.util.Map;-import java.util.Set;import javax.annotation.Nullable;import javax.inject.Inject;@@ -131,9 +130,10 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Overridepublic void changeFields(Issue issue, Serializable fieldBean, Collection<String> fieldNames) {Map<String, IssueField> prevFields = issue.getEffectiveFields();- issueFieldUnaryManager.writeFields(issue, fieldBean, fieldNames);-+ issue.setFieldBean(fieldBean, fieldNames);if (!prevFields.equals(issue.getEffectiveFields())) {+ issueFieldUnaryManager.writeFields(issue);+LastActivity lastActivity = new LastActivity();lastActivity.setAction("changed fields");lastActivity.setDate(new Date());@@ -154,13 +154,14 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Transactional@Override- public void changeState(Issue issue, String state, Serializable fieldBean,- Collection<String> fieldNames, @Nullable String comment) {+ public void changeState(Issue issue, String state, Serializable fieldBean, Collection<String> fieldNames,+ @Nullable String comment) {String prevState = issue.getState();if (!prevState.equals(state)) {Map<String, IssueField> prevFields = issue.getEffectiveFields();issue.setState(state);- issueFieldUnaryManager.writeFields(issue, fieldBean, fieldNames);+ issue.setFieldBean(fieldBean, fieldNames);+ issueFieldUnaryManager.writeFields(issue);LastActivity lastActivity = new LastActivity();lastActivity.setAction("changed state to \"" + issue.getState() + "\"");@@ -183,8 +184,9 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Transactional@Override- public void batchUpdate(Iterator<? extends Issue> issues, @Nullable String state, @Nullable Optional<Milestone> milestone,- Serializable fieldBean, Set<String> fieldNames, @Nullable String comment) {+ public void batchUpdate(Iterator<? extends Issue> issues, @Nullable String state,+ @Nullable Optional<Milestone> milestone, Serializable fieldBean,+ Collection<String> fieldNames, @Nullable String comment) {while (issues.hasNext()) {Issue issue = issues.next();String prevState = issue.getState();@@ -194,8 +196,8 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeissue.setState(state);if (milestone != null)issue.setMilestone(milestone.orNull());-- issueFieldUnaryManager.writeFields(issue, fieldBean, fieldNames);+ issue.setFieldBean(fieldBean, fieldNames);+ issueFieldUnaryManager.writeFields(issue);LastActivity lastActivity = new LastActivity();lastActivity.setAction("batch edited issue");diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.javaindex 6db05521a0..39dae20516 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java@@ -1,14 +1,9 @@package io.onedev.server.manager.impl;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;-import java.util.Collections;import java.util.HashSet;-import java.util.Iterator;import java.util.List;-import java.util.Map;-import java.util.Set;import javax.inject.Inject;import javax.inject.Singleton;@@ -18,186 +13,46 @@ import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Expression;import javax.persistence.criteria.Root;-import org.apache.commons.lang.SerializationUtils;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import io.onedev.server.exception.OneException;import io.onedev.server.manager.IssueFieldUnaryManager;-import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;-import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.IssueField;-import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.util.EditContext;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.web.editable.BeanDescriptor;-import io.onedev.server.web.editable.EditableUtils;-import io.onedev.server.web.editable.PropertyDescriptor;@Singletonpublic class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFieldUnary> implements IssueFieldUnaryManager {- private static final Logger logger = LoggerFactory.getLogger(DefaultIssueManager.class);-- private static final String FIELD_BEAN_PREFIX = "IssueFieldBean";-- private final ProjectManager projectManager;-@Inject- public DefaultIssueFieldUnaryManager(Dao dao, ProjectManager projectManager) {+ public DefaultIssueFieldUnaryManager(Dao dao) {super(dao);- this.projectManager = projectManager;- }-- @SuppressWarnings("unchecked")- @Override- public Class<? extends Serializable> defineFieldBeanClass(Project project, boolean setDefaultValue) {- String className = FIELD_BEAN_PREFIX + project.getId();-- return (Class<? extends Serializable>) InputSpec.defineClass(className, project.getIssueWorkflow().getFieldSpecs(), setDefaultValue);- }-- @Override- public Class<? extends Serializable> loadFieldBeanClass(String className, boolean setDefaultValue) {- if (className.startsWith(FIELD_BEAN_PREFIX)) {- Long projectId = Long.valueOf(className.substring(FIELD_BEAN_PREFIX.length()));- return defineFieldBeanClass(projectManager.load(projectId), setDefaultValue);- } else {- return null;- }- }-- @Sessional- @Override- public Serializable readFields(Issue issue) {- BeanDescriptor beanDescriptor = new BeanDescriptor(defineFieldBeanClass(issue.getProject(), true));-- Map<String, PropertyDescriptor> propertyDescriptors = beanDescriptor.getMapOfDisplayNameToPropertyDescriptor();-- Serializable fieldBean = (Serializable) beanDescriptor.newBeanInstance();-- for (Map.Entry<String, IssueField> entry: issue.getEffectiveFields().entrySet()) {- List<String> strings = entry.getValue().getValues();- Collections.sort(strings);-- InputSpec fieldSpec = issue.getProject().getIssueWorkflow().getFieldSpec(entry.getKey());- if (fieldSpec != null) {- try {- Object fieldValue;- if (!strings.isEmpty())- fieldValue = fieldSpec.convertToObject(strings);- else- fieldValue = null;- propertyDescriptors.get(fieldSpec.getName()).setPropertyValue(fieldBean, fieldValue);- } catch (Exception e) {- logger.error("Error populating bean for field: " + fieldSpec.getName(), e);- }- }- }-- return fieldBean;}@Transactional@Override- public void writeFields(Issue issue, Serializable fieldBean, Collection<String> fieldNames) {- if (!fieldNames.isEmpty()) {- Query query = getSession().createQuery("delete from IssueFieldUnary where issue = :issue and name in (:names)");+ public void writeFields(Issue issue) {+ Collection<Long> ids = new HashSet<>();+ for (IssueFieldUnary unary: issue.getFieldUnaries()) {+ if (unary.getId() != null)+ ids.add(unary.getId());+ }+ if (!ids.isEmpty()) {+ Query query = getSession().createQuery("delete from IssueFieldUnary where issue = :issue and id not in (:ids)");+ query.setParameter("issue", issue);+ query.setParameter("ids", ids);+ query.executeUpdate();+ } else {+ Query query = getSession().createQuery("delete from IssueFieldUnary where issue = :issue");query.setParameter("issue", issue);- query.setParameter("names", fieldNames);query.executeUpdate();- for (Iterator<IssueFieldUnary> it = issue.getFieldUnaries().iterator(); it.hasNext();) {- if (fieldNames.contains(it.next().getName()))- it.remove();- }}- BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());-- for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {- String fieldName = propertyDescriptor.getDisplayName();- if (fieldNames.contains(fieldName)) {- Object fieldValue = propertyDescriptor.getPropertyValue(fieldBean);- InputSpec fieldSpec = issue.getProject().getIssueWorkflow().getFieldSpec(fieldName);- if (fieldSpec != null) {- long ordinal = fieldSpec.getOrdinal(new OneContext() {-- @Override- public Project getProject() {- return issue.getProject();- }-- @Override- public EditContext getEditContext(int level) {- return new EditContext() {-- @Override- public Object getInputValue(String name) {- return beanDescriptor.getMapOfDisplayNameToPropertyDescriptor().get(name).getPropertyValue(fieldBean);- }-- };- }-- @Override- public InputContext getInputContext() {- throw new UnsupportedOperationException();- }-- }, fieldValue);-- IssueFieldUnary field = new IssueFieldUnary();- field.setIssue(issue);- field.setName(fieldName);- field.setOrdinal(ordinal);- field.setType(EditableUtils.getDisplayName(fieldSpec.getClass()));-- if (fieldValue != null) {- List<String> strings = fieldSpec.convertToStrings(fieldValue);- if (!strings.isEmpty()) {- for (String string: strings) {- IssueFieldUnary cloned = (IssueFieldUnary) SerializationUtils.clone(field);- cloned.setIssue(issue);- cloned.setValue(string);- save(cloned);- issue.getFieldUnaries().add(cloned);- }- } else {- save(field);- issue.getFieldUnaries().add(field);- }- } else {- save(field);- issue.getFieldUnaries().add(field);- }- }- }- }- }-- @Override- public Set<String> getExcludedProperties(Issue issue, String state) {- Map<String, PropertyDescriptor> propertyDescriptors =- new BeanDescriptor(defineFieldBeanClass(issue.getProject(), false)).getMapOfDisplayNameToPropertyDescriptor();- StateSpec stateSpec = issue.getProject().getIssueWorkflow().getStateSpec(state);- if (stateSpec == null)- throw new OneException("Unable to find state spec: " + state);- Set<String> excludedProperties = new HashSet<>();- for (InputSpec fieldSpec: issue.getProject().getIssueWorkflow().getFieldSpecs()) {- if (!stateSpec.getFields().contains(fieldSpec.getName())- || issue.getEffectiveFields().containsKey(fieldSpec.getName())) {- excludedProperties.add(propertyDescriptors.get(fieldSpec.getName()).getPropertyName());- }+ for (IssueFieldUnary unary: issue.getFieldUnaries()) {+ if (unary.isNew())+ save(unary);}- return excludedProperties;}@Transactionaldiff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.javaindex 129ccb02ef..982799dd14 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java@@ -1,6 +1,5 @@package io.onedev.server.manager.impl;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.HashMap;@@ -69,7 +68,7 @@ import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedState@Singletonpublic class DefaultIssueManager extends AbstractEntityManager<Issue> implements IssueManager {- private final IssueFieldUnaryManager issueFieldManager;+ private final IssueFieldUnaryManager issueFieldUnaryManager;private final ListenerRegistry listenerRegistry;@@ -78,10 +77,10 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsprivate final Map<String, AtomicLong> nextNumbers = new HashMap<>();@Inject- public DefaultIssueManager(Dao dao, IssueFieldUnaryManager issueFieldManager,+ public DefaultIssueManager(Dao dao, IssueFieldUnaryManager issueFieldUnaryManager,IssueQuerySettingManager issueQuerySettingManager, ListenerRegistry listenerRegistry) {super(dao);- this.issueFieldManager = issueFieldManager;+ this.issueFieldUnaryManager = issueFieldUnaryManager;this.issueQuerySettingManager = issueQuerySettingManager;this.listenerRegistry = listenerRegistry;}@@ -97,7 +96,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Transactional@Override- public void open(Issue issue, Serializable fieldBean) {+ public void open(Issue issue) {LastActivity lastActivity = new LastActivity();lastActivity.setAction("submitted");lastActivity.setUser(issue.getSubmitter());@@ -106,8 +105,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsissue.setNumber(getNextNumber(issue.getProject()));save(issue);- StateSpec initialState = issue.getProject().getIssueWorkflow().getInitialStateSpec();- issueFieldManager.writeFields(issue, fieldBean, initialState.getFields());+ issueFieldUnaryManager.writeFields(issue);listenerRegistry.post(new IssueOpened(issue));}@@ -193,7 +191,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsquery.setMaxResults(maxResults);List<Issue> issues = query.getResultList();if (!issues.isEmpty())- issueFieldManager.populateFields(issues);+ issueFieldUnaryManager.populateFields(issues);return issues;}@@ -688,4 +686,5 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}}*/+}diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex b2c9133d7c..1727a9c000 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -1,12 +1,16 @@package io.onedev.server.model;+import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Date;import java.util.HashMap;+import java.util.HashSet;+import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import java.util.Set;import java.util.UUID;import javax.annotation.Nullable;@@ -23,20 +27,31 @@ import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.Version;+import org.apache.commons.lang.SerializationUtils;import org.apache.commons.lang3.StringUtils;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;import com.google.common.collect.Lists;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;+import io.onedev.server.exception.OneException;import io.onedev.server.manager.VisitManager;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.Referenceable;import io.onedev.server.model.support.issue.IssueField;+import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.EditContext;+import io.onedev.server.util.OneContext;+import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.editable.BeanDescriptor;+import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.annotation.Editable;/**@@ -58,6 +73,8 @@ public class Issue extends AbstractEntity implements Referenceable {private static final long serialVersionUID = 1L;+ private static final Logger logger = LoggerFactory.getLogger(Issue.class);+public static final Map<String, String> BUILTIN_FIELDS = new LinkedHashMap<>();public static final String NUMBER = "Number";@@ -375,5 +392,117 @@ public class Issue extends AbstractEntity implements Referenceable {public String getMilestoneName() {return getMilestone()!=null? getMilestone().getName():null;}++ public Collection<String> getExcludedFields(Class<?> fieldBeanClass, String state) {+ Map<String, PropertyDescriptor> propertyDescriptors =+ new BeanDescriptor(fieldBeanClass).getMapOfDisplayNameToPropertyDescriptor();+ StateSpec stateSpec = getProject().getIssueWorkflow().getStateSpec(state);+ if (stateSpec == null)+ throw new OneException("Unable to find state spec: " + state);+ Set<String> excludedProperties = new HashSet<>();+ for (InputSpec fieldSpec: getProject().getIssueWorkflow().getFieldSpecs()) {+ if (!stateSpec.getFields().contains(fieldSpec.getName())+ || getEffectiveFields().containsKey(fieldSpec.getName())) {+ excludedProperties.add(propertyDescriptors.get(fieldSpec.getName()).getPropertyName());+ }+ }+ return excludedProperties;+ }++ public Serializable getFieldBean(Class<?> fieldBeanClass) {+ BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBeanClass);++ Map<String, PropertyDescriptor> propertyDescriptors = beanDescriptor.getMapOfDisplayNameToPropertyDescriptor();++ Serializable fieldBean = (Serializable) beanDescriptor.newBeanInstance();++ for (Map.Entry<String, IssueField> entry: getEffectiveFields().entrySet()) {+ List<String> strings = entry.getValue().getValues();+ Collections.sort(strings);++ InputSpec fieldSpec = getProject().getIssueWorkflow().getFieldSpec(entry.getKey());+ if (fieldSpec != null) {+ try {+ Object fieldValue;+ if (!strings.isEmpty())+ fieldValue = fieldSpec.convertToObject(strings);+ else+ fieldValue = null;+ propertyDescriptors.get(fieldSpec.getName()).setPropertyValue(fieldBean, fieldValue);+ } catch (Exception e) {+ logger.error("Error populating bean for field: " + fieldSpec.getName(), e);+ }+ }+ }++ return fieldBean;+ }++ public void setFieldBean(Serializable fieldBean, Collection<String> fieldNames) {+ for (Iterator<IssueFieldUnary> it = getFieldUnaries().iterator(); it.hasNext();) {+ if (fieldNames.contains(it.next().getName()))+ it.remove();+ }++ BeanDescriptor beanDescriptor = new BeanDescriptor(fieldBean.getClass());++ for (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {+ String fieldName = propertyDescriptor.getDisplayName();+ if (fieldNames.contains(fieldName)) {+ Object fieldValue = propertyDescriptor.getPropertyValue(fieldBean);+ InputSpec fieldSpec = getProject().getIssueWorkflow().getFieldSpec(fieldName);+ if (fieldSpec != null) {+ long ordinal = fieldSpec.getOrdinal(new OneContext() {++ @Override+ public Project getProject() {+ return Issue.this.getProject();+ }++ @Override+ public EditContext getEditContext(int level) {+ return new EditContext() {++ @Override+ public Object getInputValue(String name) {+ return beanDescriptor.getMapOfDisplayNameToPropertyDescriptor().get(name).getPropertyValue(fieldBean);+ }++ };+ }++ @Override+ public InputContext getInputContext() {+ throw new UnsupportedOperationException();+ }++ }, fieldValue);++ IssueFieldUnary field = new IssueFieldUnary();+ field.setIssue(this);+ field.setName(fieldName);+ field.setOrdinal(ordinal);+ field.setType(EditableUtils.getDisplayName(fieldSpec.getClass()));++ if (fieldValue != null) {+ List<String> strings = fieldSpec.convertToStrings(fieldValue);+ if (!strings.isEmpty()) {+ for (String string: strings) {+ IssueFieldUnary cloned = (IssueFieldUnary) SerializationUtils.clone(field);+ cloned.setIssue(this);+ cloned.setValue(string);+ getFieldUnaries().add(cloned);+ }+ } else {+ getFieldUnaries().add(field);+ }+ } else {+ getFieldUnaries().add(field);+ }+ }+ }+ }++ }}diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex a22cb91ae6..68f3915f24 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -3,6 +3,7 @@ package io.onedev.server.model;import java.io.File;import java.io.IOException;import java.io.InputStream;+import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -87,6 +88,7 @@ import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.persistence.UnitOfWork;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.validation.annotation.ProjectName;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Markdown;@@ -109,6 +111,8 @@ public class Project extends AbstractEntity {public static final int MAX_UPLOAD_SIZE = 10; // In mega bytes+ public static final String ISSUE_FIELD_BEAN_PREFIX = "IssueFieldBean";+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=true)private Project forkedFrom;@@ -1043,4 +1047,22 @@ public class Project extends AbstractEntity {return null;}+ @SuppressWarnings("unchecked")+ public Class<? extends Serializable> defineIssueFieldBeanClass(boolean setDefaultValue) {+ String className = ISSUE_FIELD_BEAN_PREFIX + "_" + setDefaultValue + "_" + getId();+ return (Class<? extends Serializable>) InputSpec.defineClass(className, getIssueWorkflow().getFieldSpecs(), setDefaultValue);+ }++ @Nullable+ public static Class<? extends Serializable> loadIssueFieldBeanClass(String className) {+ if (className.startsWith(ISSUE_FIELD_BEAN_PREFIX)) {+ String tempStr = className.substring(ISSUE_FIELD_BEAN_PREFIX.length()+1);+ boolean setDefaultValue = Boolean.parseBoolean(StringUtils.substringBefore(tempStr, "_"));+ Long projectId = Long.parseLong(StringUtils.substringAfter(tempStr, "_"));+ return OneDev.getInstance(ProjectManager.class).load(projectId).defineIssueFieldBeanClass(setDefaultValue);+ } else {+ return null;+ }+ }+}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.javaindex 40fe862812..b6d8b4ab86 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java@@ -63,6 +63,8 @@ public class FieldUnaryCriteria extends FieldCriteria {public void populate(Issue issue, Serializable fieldBean, Set<String> initedLists) {if (operator == IssueQueryLexer.IsEmpty)setFieldValue(fieldBean, null);+ else if (operator == IssueQueryLexer.IsMe)+ setFieldValue(fieldBean, SecurityUtils.getUser().getName());}}diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.javaindex 3e1121e082..56a0a59442 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java@@ -28,7 +28,6 @@ import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;@@ -165,7 +164,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {builtInFieldsBean = new BuiltInFieldsBean();try {- customFieldsBean = OneDev.getInstance(IssueFieldUnaryManager.class).defineFieldBeanClass(getProject(), false).newInstance();+ customFieldsBean = getProject().defineIssueFieldBeanClass(false).newInstance();} catch (InstantiationException | IllegalAccessException e) {throw new RuntimeException(e);}@@ -231,8 +230,8 @@ abstract class BatchEditPanel extends Panel implements InputContext {Set<String> fieldNames = new HashSet<>(selectedFields);fieldNames.remove(Issue.STATE);fieldNames.remove(Issue.MILESTONE);- OneDev.getInstance(IssueChangeManager.class).batchUpdate(getIssueIterator(), state, milestone,- customFieldsBean, fieldNames, comment);+ OneDev.getInstance(IssueChangeManager.class).batchUpdate(+ getIssueIterator(), state, milestone, customFieldsBean, fieldNames, comment);onUpdated(target);}diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.htmlindex 6db1ea2e36..0ae0ba6c70 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html@@ -27,7 +27,8 @@<a wicket:id="link"><span wicket:id="label"></span></a></wicket:fragment><wicket:fragment wicket:id="userFrag">- <a wicket:id="link"></a>+ <a wicket:id="avatar" class="avatar"></a>+ <a wicket:id="name" class="name"></a></wicket:fragment><wicket:fragment wicket:id="fieldsFrag"><form wicket:id="form" class="issue-table-fields leave-confirm no-autofocus">diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.javaindex c20bb044c4..e616533998 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java@@ -51,9 +51,10 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.IssueQueryBehavior;-import io.onedev.server.web.component.IssueStateLabel;+import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;+import io.onedev.server.web.component.issuestate.IssueStateLabel;import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;@@ -405,6 +406,19 @@ public abstract class IssueListPanel extends GenericPanel<String> {List<IColumn<Issue, Void>> columns = new ArrayList<>();+ columns.add(new AbstractColumn<Issue, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId, IModel<Issue> rowModel) {+ cellItem.add(new Label(componentId, ""));+ }++ @Override+ public String getCssClass() {+ return "new-indicator";+ }++ });if (SecurityUtils.canManage(getProject())) {columns.add(selectionColumn = new SelectionColumn<Issue, Void>() {@@ -470,7 +484,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {Issue issue = rowModel.getObject();Fragment fragment = new Fragment(componentId, "userFrag", IssueListPanel.this);User submitter = User.getForDisplay(issue.getSubmitter(), issue.getSubmitterName());- fragment.add(new UserLink("link", submitter));+ fragment.add(new AvatarLink("avatar", submitter));+ fragment.add(new UserLink("name", submitter));cellItem.add(fragment);}});diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/component/issuelist/issue-list.cssindex db589839fb..733fde1ffe 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/issue-list.css+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/issue-list.css@@ -21,15 +21,15 @@color: #999;cursor: default;}-.issue-list>.body td.state div {- padding: 2px 4px;- border-radius: 3px;-}.issue-list>.body td.custom-field {white-space: nowrap;}-.issue-list>.body tr.issue.new {- font-weight: bold;+.issue-list>.body .new-indicator {+ width: 4px;+ padding: 0;+}+.issue-list>.body tr.issue.new td.new-indicator {+ background: #4667EE;}.issue-batch-edit form .modal-body>div {margin-bottom: 20px;diff --git a/core/src/main/java/io/onedev/server/web/component/issuestate/IssueStateCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/issuestate/IssueStateCssResourceReference.javanew file mode 100644index 0000000000..f55496b6b3--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/issuestate/IssueStateCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.issuestate;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class IssueStateCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public IssueStateCssResourceReference() {+ super(IssueStateCssResourceReference.class, "issue-state.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/IssueStateLabel.java b/core/src/main/java/io/onedev/server/web/component/issuestate/IssueStateLabel.javasimilarity index 74%rename from core/src/main/java/io/onedev/server/web/component/IssueStateLabel.javarename to core/src/main/java/io/onedev/server/web/component/issuestate/IssueStateLabel.javaindex b530ad893c..cb16671507 100644--- a/core/src/main/java/io/onedev/server/web/component/IssueStateLabel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuestate/IssueStateLabel.java@@ -1,6 +1,8 @@-package io.onedev.server.web.component;+package io.onedev.server.web.component.issuestate;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;@@ -36,6 +38,14 @@ public class IssueStateLabel extends Label {add(AttributeAppender.append("style", style));add(AttributeAppender.append("title", "State"));}++ add(AttributeAppender.append("class", "issue-state"));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new IssueStateCssResourceReference()));}}diff --git a/core/src/main/java/io/onedev/server/web/component/issuestate/issue-state.css b/core/src/main/java/io/onedev/server/web/component/issuestate/issue-state.cssnew file mode 100644index 0000000000..70f0a4d519--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/issuestate/issue-state.css@@ -0,0 +1,6 @@+.issue-state {+ border-radius: 3px;+ padding: 2px 4px;+ display: inline;+ font-weight: bold;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueCssResourceReference.javanew file mode 100644index 0000000000..9dc73cc504--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueCssResourceReference.java@@ -0,0 +1,12 @@+package io.onedev.server.web.component.newissue;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++@SuppressWarnings("serial")+public class NewIssueCssResourceReference extends BaseDependentCssResourceReference {++ public NewIssueCssResourceReference() {+ super(NewIssueCssResourceReference.class, "new-issue.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.html b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.htmlnew file mode 100644index 0000000000..01b19b274c--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.html@@ -0,0 +1,20 @@+<wicket:panel>+ <div class="new-issue">+ <div class="form-group">+ <label class="control-label">Title <span class="required">*</span></label>+ <input wicket:id="title" type="text" class="form-control" placeholder="Input title here">+ <div wicket:id="titleFeedback"></div>+ </div>+ <div class="form-group">+ <label class="control-label">Description</label>+ <div wicket:id="description"></div>+ </div>+ <div class="form-group">+ <label class="control-label">Milestone</label>+ <div>+ <input wicket:id="milestone" type="hidden" class="form-group"></input>+ </div>+ </div>+ <div wicket:id="fields"></div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.javanew file mode 100644index 0000000000..a3274f4189--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java@@ -0,0 +1,165 @@+package io.onedev.server.web.component.newissue;++import java.io.Serializable;+import java.util.Collection;+import java.util.Date;+import java.util.List;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.form.FormComponentPanel;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.query.IssueCriteria;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.component.comment.CommentInput;+import io.onedev.server.web.component.comment.ProjectAttachmentSupport;+import io.onedev.server.web.component.markdown.AttachmentSupport;+import io.onedev.server.web.component.stringchoice.StringSingleChoice;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;++@SuppressWarnings("serial")+public abstract class NewIssueEditor extends FormComponentPanel<Issue> implements InputContext {++ private TextField<String> titleInput;++ private CommentInput descriptionInput;++ private StringSingleChoice milestoneChoice;++ private BeanEditor fieldEditor;++ public NewIssueEditor(String id) {+ super(id, Model.of(new Issue()));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Issue issue = new Issue();+ issue.setProject(getProject());+ Serializable fieldBean;+ try {+ fieldBean = getProject().defineIssueFieldBeanClass(true).newInstance();+ } catch (InstantiationException | IllegalAccessException e) {+ throw new RuntimeException(e);+ }++ if (getTemplate() != null)+ getTemplate().populate(issue, fieldBean);++ titleInput = new TextField<String>("title", Model.of(""));+ titleInput.setRequired(true).setLabel(Model.of("Title"));+ add(titleInput);+ add(new FencedFeedbackPanel("titleFeedback", titleInput));++ titleInput.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return !titleInput.isValid()?" has-error":"";+ }++ }));++ add(descriptionInput = new CommentInput("description", Model.of(""), false) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getProject(), issue.getUUID());+ }++ @Override+ protected Project getProject() {+ return NewIssueEditor.this.getProject();+ }++ });++ List<String> milestones = getProject().getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());+ milestoneChoice = new StringSingleChoice("milestone",+ Model.of(issue.getMilestoneName()), milestones) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ getSettings().setPlaceholder("No milestone");+ }++ };+ milestoneChoice.setRequired(false);+ add(milestoneChoice);++ Collection<String> excludedFields = issue.getExcludedFields(fieldBean.getClass(),+ getProject().getIssueWorkflow().getInitialStateSpec().getName());+ add(fieldEditor = new BeanContext(fieldBean.getClass(), excludedFields)+ .renderForEdit("fields", Model.of(fieldBean)));+ }++ protected abstract Project getProject();++ @Nullable+ protected IssueCriteria getTemplate() {+ return null;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new NewIssueCssResourceReference()));+ }++ @Override+ public List<String> getInputNames() {+ return getProject().getIssueWorkflow().getFieldNames();+ }++ @Override+ public InputSpec getInputSpec(String inputName) {+ return getProject().getIssueWorkflow().getFieldSpec(inputName);+ }++ @Override+ public boolean isReservedName(String inputName) {+ throw new UnsupportedOperationException();+ }++ private Issue newIssue() {+ Issue issue = new Issue();+ issue.setProject(getProject());+ issue.setSubmitDate(new Date());+ issue.setState(getProject().getIssueWorkflow().getInitialStateSpec().getName());+ issue.setSubmitter(SecurityUtils.getUser());+ return issue;+ }++ @Override+ public void convertInput() {+ try {+ Issue issue = newIssue();+ issue.setTitle(titleInput.getConvertedInput());+ issue.setDescription(descriptionInput.getConvertedInput());+ issue.setMilestone(getProject().getMilestone(milestoneChoice.getConvertedInput()));+ issue.setFieldBean(fieldEditor.getConvertedInput(),+ getProject().getIssueWorkflow().getInitialStateSpec().getFields());+ setConvertedInput(issue);+ } catch (ConversionException e) {+ error(newValidationError(e));+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/newissue/new-issue.css b/core/src/main/java/io/onedev/server/web/component/newissue/new-issue.cssnew file mode 100644index 0000000000..38109b1cc7--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/newissue/new-issue.css@@ -0,0 +1,3 @@+.new-issue .select2-container {+ width: 100%;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.html b/core/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.htmlindex 1ef29943e0..aee5e05313 100644--- a/core/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.html@@ -4,7 +4,7 @@<i class="fa fa-ext fa-repo"></i> <a wicket:id="link"><span wicket:id="name"></span></a></wicket:fragment><wicket:fragment wicket:id="authorFrag">- <a wicket:id="avatar"></a> <a wicket:id="name"></a>+ <a wicket:id="avatar" class="avatar"></a> <a wicket:id="name" class="name"></a></wicket:fragment><wicket:fragment wicket:id="commitMessageFrag"><a wicket:id="link"><span wicket:id="message"></span></a>diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanContext.java b/core/src/main/java/io/onedev/server/web/editable/BeanContext.javaindex d59fd40130..647ac63d0c 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanContext.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanContext.java@@ -1,6 +1,7 @@package io.onedev.server.web.editable;import java.io.Serializable;+import java.util.Collection;import java.util.HashSet;import java.util.Set;@@ -22,7 +23,7 @@ public class BeanContext implements Serializable {descriptor = new BeanDescriptor(beanClass, Sets.newHashSet());}- public BeanContext(Class<?> beanClass, Set<String> excludedProperties) {+ public BeanContext(Class<?> beanClass, Collection<String> excludedProperties) {descriptor = new BeanDescriptor(beanClass, excludedProperties);}@@ -90,7 +91,7 @@ public class BeanContext implements Serializable {}public static BeanEditor editBean(String componentId, final Serializable bean,- Set<String> excludedProperties) {+ Collection<String> excludedProperties) {IModel<Serializable> beanModel = new IModel<Serializable>() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.javaindex ca31714e7c..2b1d278212 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java@@ -3,10 +3,10 @@ package io.onedev.server.web.editable;import java.io.Serializable;import java.lang.reflect.Method;import java.util.ArrayList;+import java.util.Collection;import java.util.HashMap;import java.util.List;import java.util.Map;-import java.util.Set;import javax.annotation.Nullable;@@ -27,7 +27,7 @@ public class BeanDescriptor implements Serializable {this(beanClass, Sets.newHashSet());}- public BeanDescriptor(Class<?> beanClass, Set<String> excludedProperties) {+ public BeanDescriptor(Class<?> beanClass, Collection<String> excludedProperties) {this.beanClass = beanClass;propertyDescriptors = new ArrayList<>();diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.cssindex eb6bc8be60..912f646535 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css@@ -555,4 +555,23 @@ a.input-clear {}a.input-clear.input-group-clear {right: 42px;+}+.message-box>.content, .confirm-box>.content {+ font-size: 18px;+ padding: 10px 20px;+}+.message-box>.actions, .confirm-box>.actions {+ border-top: 1px solid #E0E0E0;+ padding: 12px;+ text-align: center;+}+.confirm-box>.actions {+ text-align: right;+}+.confirm-box>.actions>* {+ margin-right: 8px;+}++.avatar+.name {+ margin-left: 4px !important;}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.jsindex 9765082a88..b61c8c58db 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js@@ -21,11 +21,14 @@ onedev.server.folderView = function(containerId, lastCommitsUrl) {var lastCommit = lastCommits[path];if (lastCommit) {- var html = "<img src='" + lastCommit.authorAvatarUrl + "' class='avatar'/> ";- if (lastCommit.authorUrl)- html += "<a href='" + lastCommit.authorUrl + "'>" + lastCommit.authorName + "</a>";- else- html += "<span>" + lastCommit.authorName + "</span>";+ var html;+ if (lastCommit.authorUrl) {+ html = "<a href='" + lastCommit.authorUrl + "' class='avatar'><img src='" + lastCommit.authorAvatarUrl + "' class='avatar'/></a>";+ html += "<a href='" + lastCommit.authorUrl + "' class='name'>" + lastCommit.authorName + "</a>";+ } else {+ html = "<img src='" + lastCommit.authorAvatarUrl + "' class='avatar'/> ";+ html += "<span class='name'>" + lastCommit.authorName + "</span>";+ }$row.children(".last-commit.author").empty().append(html);$row.children(".last-commit.when").append("<span>" + lastCommit.when + "</span>");diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.htmlindex b15dcc3dfd..464258623e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.html@@ -1,15 +1,15 @@<wicket:panel><div wicket:id="content" class="field-values"></div><wicket:fragment wicket:id="nonEmptyValuesFrag">- <div wicket:id="values" class="value"></div>+ <div wicket:id="values" class="value"><span wicket:id="value"></span></div></wicket:fragment><wicket:fragment wicket:id="userFrag">- <a wicket:id="name" class="user"></a><a wicket:id="avatar" class="avatar"></a>+ <a wicket:id="name" class="name"></a></wicket:fragment><wicket:fragment wicket:id="issueFrag"><div class="issue">- <a wicket:id="link"><span wicket:id="label"></span></a> <span wicket:id="state" class="label state"></span>+ <a wicket:id="link"><span wicket:id="label"></span></a> <span wicket:id="state"></span></div></wicket:fragment></wicket:panel>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.javaindex 6f7802be80..f77c1bf947 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java@@ -8,9 +8,10 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.model.Model;import org.unbescape.html.HtmlEscape;@@ -26,8 +27,8 @@ import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.web.component.IssueStateLabel;import io.onedev.server.web.component.avatar.AvatarLink;+import io.onedev.server.web.component.issuestate.IssueStateLabel;import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.project.ProjectPage;@@ -49,53 +50,55 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {Project project = ((ProjectPage) getPage()).getProject();if (getField() != null && !getField().getValues().isEmpty()) {- UserManager userManager = OneDev.getInstance(UserManager.class);- IssueManager issueManager = OneDev.getInstance(IssueManager.class);Fragment fragment = new Fragment("content", "nonEmptyValuesFrag", this);- RepeatingView valuesView = new RepeatingView("values");- for (String value: getField().getValues()) {- if (getField().getType().equals(InputSpec.USER_CHOICE)) {- User user = User.getForDisplay(userManager.findByName(value), value);- Fragment userFrag = new Fragment(valuesView.newChildId(), "userFrag", this);- userFrag.add(new UserLink("name", user));- userFrag.add(new AvatarLink("avatar", user));- valuesView.add(userFrag);- } else if (getField().getType().equals(InputSpec.ISSUE_CHOICE)) {- Issue issue = issueManager.find(project, Long.valueOf(value));- if (issue != null) {- Fragment issueFrag = new Fragment(valuesView.newChildId(), "issueFrag", this);- Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));- link.add(new Label("label", "#" + issue.getNumber()));- issueFrag.add(link);- issueFrag.add(new IssueStateLabel("state", Model.of(issue)));- valuesView.add(issueFrag);+ fragment.add(new ListView<String>("values", getField().getValues()) {++ @Override+ protected void populateItem(ListItem<String> item) {+ String value = item.getModelObject();+ if (getField().getType().equals(InputSpec.USER_CHOICE)) {+ User user = User.getForDisplay(OneDev.getInstance(UserManager.class).findByName(value), value);+ Fragment userFrag = new Fragment("value", "userFrag", FieldValuesPanel.this);+ userFrag.add(new UserLink("name", user));+ userFrag.add(new AvatarLink("avatar", user));+ item.add(userFrag);+ } else if (getField().getType().equals(InputSpec.ISSUE_CHOICE)) {+ Issue issue = OneDev.getInstance(IssueManager.class).find(project, Long.valueOf(value));+ if (issue != null) {+ Fragment issueFrag = new Fragment("value", "issueFrag", FieldValuesPanel.this);+ Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));+ link.add(new Label("label", "#" + issue.getNumber()));+ issueFrag.add(link);+ issueFrag.add(new IssueStateLabel("state", Model.of(issue)));+ item.add(issueFrag);+ } else {+ item.add(new Label("values", "#" + value));+ }} else {- valuesView.add(new Label(valuesView.newChildId(), "#" + value));- }- } else {- Label label = new Label(valuesView.newChildId(), value);- InputSpec fieldSpec = getIssue().getProject().getIssueWorkflow().getFieldSpec(getField().getName());- if (fieldSpec != null && fieldSpec instanceof ChoiceInput) {- ChoiceProvider choiceProvider = ((ChoiceInput)fieldSpec).getChoiceProvider();- OneContext.push(new ComponentContext(this));- try {- String backgroundColor = choiceProvider.getChoices(false).get(value);- if (backgroundColor != null) {- String fontColor = ColorUtils.isLight(backgroundColor)?"black":"white";- String style = String.format(- "background-color: %s; color: %s;",- backgroundColor, fontColor);- label.add(AttributeAppender.append("style", style));- label.add(AttributeAppender.append("class", "has-color"));+ Label label = new Label("value", value);+ InputSpec fieldSpec = getIssue().getProject().getIssueWorkflow().getFieldSpec(getField().getName());+ if (fieldSpec != null && fieldSpec instanceof ChoiceInput) {+ ChoiceProvider choiceProvider = ((ChoiceInput)fieldSpec).getChoiceProvider();+ OneContext.push(new ComponentContext(this));+ try {+ String backgroundColor = choiceProvider.getChoices(false).get(value);+ if (backgroundColor != null) {+ String fontColor = ColorUtils.isLight(backgroundColor)?"black":"white";+ String style = String.format(+ "background-color: %s; color: %s;",+ backgroundColor, fontColor);+ label.add(AttributeAppender.append("style", style));+ item.add(AttributeAppender.append("class", "has-color"));+ }+ } finally {+ OneContext.pop();}- } finally {- OneContext.pop();- }- }- valuesView.add(label);+ }+ item.add(label);+ }}- }- fragment.add(valuesView);++ });add(fragment);} else {InputSpec fieldSpec = null;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/field-values.css b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/field-values.cssindex 33d4088890..73728b53a5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/field-values.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/field-values.css@@ -1,14 +1,17 @@.field-values .issue a {margin-right: 4px;}-.field-values .avatar {- margin-left: 4px;+.field-values .issue .issue-state {+ font-size: 11px;}-.field-values>.has-color {- margin-bottom: 4px;+.field-values .has-color {+ margin-bottom: 8px;+}+.field-values .has-color:last-child {+ margin-bottom: 0;+}+.field-values .has-color span {border-radius: 3px;padding: 2px 4px;+ font-weight: bold;}-.field-values>.has-color:last-child {- margin-bottom: 0;-}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.htmlindex 477196dc5e..4efb07e0aa 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.html@@ -3,6 +3,7 @@<div class="head clearfix"><span class="pull-left">Backlog</span><span wicket:id="count" class="badge pull-right"></span>+ <a wicket:id="addCard" title="Add new card to this list" class="add-card pull-right"><i class="fa fa-plus"></i></a></div><div wicket:id="body" class="body"></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.javaindex beb9f44dae..fd6a7168aa 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java@@ -5,6 +5,8 @@ import java.util.List;import javax.annotation.Nullable;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.basic.Label;@@ -15,8 +17,11 @@ import io.onedev.server.OneDev;import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.web.WebConstants;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;@SuppressWarnings("serial")abstract class BacklogColumnPanel extends Panel {@@ -29,6 +34,42 @@ abstract class BacklogColumnPanel extends Panel {protected void onInitialize() {super.onInitialize();+ add(new ModalLink("addCard") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new NewCardPanel(id) {++ @Override+ protected void onClose(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected Project getProject() {+ return BacklogColumnPanel.this.getProject();+ }++ @Override+ protected IssueCriteria getTemplate() {+ return getBacklogQuery().getCriteria();+ }++ @Override+ protected void onAdded(AjaxRequestTarget target, Issue issue) {+ target.add(BacklogColumnPanel.this);+ }++ };+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getBacklogQuery() != null);+ }++ });add(new Label("count", new LoadableDetachableModel<String>() {@Override@@ -47,7 +88,12 @@ abstract class BacklogColumnPanel extends Panel {});- add(new CardListPanel("body") {+ setOutputMarkupId(true);+ }++ @Override+ protected void onBeforeRender() {+ addOrReplace(new CardListPanel("body") {@Overrideprotected List<Issue> queryIssues(int page) {@@ -60,9 +106,10 @@ abstract class BacklogColumnPanel extends Panel {}});- setOutputMarkupId(true);++ super.onBeforeRender();}-+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.htmlindex f9c403580e..29b68add08 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.html@@ -5,6 +5,7 @@<a wicket:id="userLink" class="pull-left"></a><span wicket:id="title" class="pull-left"></span><span wicket:id="count" class="badge pull-right"></span>+ <a wicket:id="addCard" title="Add new card to this list" class="add-card pull-right"><i class="fa fa-plus"></i></a></div><div wicket:id="body" class="body"></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.javaindex bb16bf098f..2650a71876 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java@@ -5,6 +5,8 @@ import java.util.List;import javax.annotation.Nullable;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -39,6 +41,8 @@ import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.web.WebConstants;import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.link.UserLink;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.util.ComponentContext;@SuppressWarnings("serial")@@ -88,7 +92,29 @@ abstract class BoardColumnPanel extends Panel implements EditContext {protected void onInitialize() {super.onInitialize();- WebMarkupContainer content = new WebMarkupContainer("content");+ WebMarkupContainer content = new WebMarkupContainer("content") {++ @Override+ protected void onBeforeRender() {+ addOrReplace(new CardListPanel("body") {++ @Override+ protected List<Issue> queryIssues(int page) {+ IssueQuery query = queryModel.getObject();+ if (query != null) {+ return OneDev.getInstance(IssueManager.class).query(getProject(), query,+ page*WebConstants.PAGE_SIZE, WebConstants.PAGE_SIZE);+ } else {+ return new ArrayList<>();+ }+ }++ });++ super.onBeforeRender();+ }++ };add(content);String title;@@ -153,20 +179,45 @@ abstract class BoardColumnPanel extends Panel implements EditContext {});- content.add(new CardListPanel("body") {+ head.add(new ModalLink("addCard") {@Override- protected List<Issue> queryIssues(int page) {- IssueQuery query = queryModel.getObject();- if (query != null) {- return OneDev.getInstance(IssueManager.class).query(getProject(), query,- page*WebConstants.PAGE_SIZE, WebConstants.PAGE_SIZE);- } else {- return new ArrayList<>();- }+ protected Component newContent(String id, ModalPanel modal) {+ return new NewCardPanel(id) {++ @Override+ protected void onClose(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected Project getProject() {+ return BoardColumnPanel.this.getProject();+ }++ @Override+ protected IssueCriteria getTemplate() {+ return queryModel.getObject().getCriteria();+ }++ @Override+ protected void onAdded(AjaxRequestTarget target, Issue issue) {+ target.add(BoardColumnPanel.this);+ }++ };+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(queryModel.getObject() != null+ && (!getBoard().getIdentifyField().equals(Issue.STATE)+ || getColumn().equals(getProject().getIssueWorkflow().getInitialStateSpec().getName())));}});+setOutputMarkupId(true);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.htmlindex b348dc19a3..b7e786c16c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.html@@ -1,11 +1,13 @@<wicket:panel><div class="board-card-detail">- <div class="head">- <a wicket:id="number" class="number"><span wicket:id="label"></span></a>- <span wicket:id="title" class="title"></span>- <a wicket:id="close" class="close">x</a>+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ <span wicket:id="number" class="number"></span>+ <span wicket:id="title" class="title"></span>+ </h4></div>- <div class="body">+ <div class="modal-body"><table><tr wicket:id="fieldPairs"><td class="name">@@ -27,7 +29,7 @@</div></div><wicket:fragment wicket:id="userFrag">- <a wicket:id="name"></a><a wicket:id="avatar" class="avatar"></a>+ <a wicket:id="name" class="name"></a></wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.javaindex ca0d5bdc06..acec7d75d0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java@@ -7,11 +7,9 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Fragment;@@ -26,13 +24,12 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;-import io.onedev.server.web.component.IssueStateLabel;import io.onedev.server.web.component.avatar.AvatarLink;+import io.onedev.server.web.component.issuestate.IssueStateLabel;import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.component.markdown.ContentVersionSupport;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;-import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;import jersey.repackaged.com.google.common.collect.Lists;@@ -51,10 +48,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> {protected void onInitialize() {super.onInitialize();- Link<Void> link = new BookmarkablePageLink<Void>("number", IssueDetailPage.class,- IssueDetailPage.paramsOf(getIssue(), null));- link.add(new Label("label", "#" + getIssue().getNumber()));- add(link);+ add(new Label("number", "#" + getIssue().getNumber()));add(new Label("title", getIssue().getTitle()));@@ -100,8 +94,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> {private Component renderField(String componentId, String fieldName) {switch (fieldName) {case Issue.STATE:- return new IssueStateLabel(componentId, CardDetailPanel.this.getModel())- .add(AttributeAppender.append("class", "state"));+ return new IssueStateLabel(componentId, CardDetailPanel.this.getModel());case Issue.SUBMITTER:Fragment fragment = new Fragment(componentId, "userFrag", CardDetailPanel.this);fragment.add(new UserLink("name", User.getForDisplay(getIssue().getSubmitter(), getIssue().getSubmitterName())));diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.javaindex 6cb4fb3807..a169f35037 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardListPanel.java@@ -71,4 +71,9 @@ abstract class CardListPanel extends Panel {}protected abstract List<Issue> queryIssues(int page);++ public void addCard(AjaxRequestTarget target, Issue issue) {++ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardNotMatchingPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardNotMatchingPanel.htmlnew file mode 100644index 0000000000..ddccf75c67--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardNotMatchingPanel.html@@ -0,0 +1,11 @@+<wicket:panel>+ <div class="message-box">+ <div class="content">+ Issue created as <a wicket:id="link"><span wicket:id="label"></span></a>, but it does not match+ the list query+ </div>+ <div class="actions">+ <a wicket:id="ok" class="btn btn-primary">Ok</a>+ </div>+ </div>+</wicket:panel>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardNotMatchingPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardNotMatchingPanel.javanew file mode 100644index 0000000000..d20529305e--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardNotMatchingPanel.java@@ -0,0 +1,40 @@+package io.onedev.server.web.page.project.issues.issueboards;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Panel;++import io.onedev.server.model.Issue;+import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;++@SuppressWarnings("serial")+abstract class NewCardNotMatchingPanel extends Panel {++ public NewCardNotMatchingPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ Link<Void> link = new BookmarkablePageLink<Void>("link", IssueDetailPage.class,+ IssueDetailPage.paramsOf(getIssue(), null));+ link.add(new Label("label", "#" + getIssue().getNumber()));+ add(link);+ add(new AjaxLink<Void>("ok") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onClose(target);+ }++ });+ }++ protected abstract Issue getIssue();++ protected abstract void onClose(AjaxRequestTarget target);+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.htmlnew file mode 100644index 0000000000..ede4d22e5c--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.html@@ -0,0 +1,19 @@+<wicket:panel>+ <form wicket:id="form" class="new-board-card leave-confirm">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ New Issue+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+ <wicket:fragment wicket:id="helloFrag">+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.javanew file mode 100644index 0000000000..91de5f1d3a--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/NewCardPanel.java@@ -0,0 +1,113 @@+package io.onedev.server.web.page.project.issues.issueboards;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;++import io.onedev.server.OneDev;+import io.onedev.server.manager.IssueManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.query.IssueCriteria;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.newissue.NewIssueEditor;++@SuppressWarnings("serial")+abstract class NewCardPanel extends Panel {++ public NewCardPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);++ NewIssueEditor editor = new NewIssueEditor("editor") {++ @Override+ protected Project getProject() {+ return NewCardPanel.this.getProject();+ }++ @Override+ protected IssueCriteria getTemplate() {+ return NewCardPanel.this.getTemplate();+ }++ };++ form.add(editor);++ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ Issue issue = editor.getConvertedInput();+ OneDev.getInstance(IssueManager.class).open(issue);+ if (getTemplate().matches(issue)) {+ onAdded(target, issue);+ } else {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ return new NewCardNotMatchingPanel(id) {++ @Override+ protected Issue getIssue() {+ return issue;+ }++ @Override+ protected void onClose(AjaxRequestTarget target) {+ close();+ }+ };+ }+ };+ }+ onClose(target);+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onClose(target);+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onClose(target);+ }++ });+ add(form);+ }++ protected abstract IssueCriteria getTemplate();++ protected abstract void onAdded(AjaxRequestTarget target, Issue issue);++ protected abstract void onClose(AjaxRequestTarget target);++ protected abstract Project getProject();+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.cssindex 83621aa78e..8116062818 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/issue-boards.css@@ -95,11 +95,9 @@border-bottom: 1px solid #E0E0E0;border-top: 3px solid #E0E0E0;}-#issue-boards>.body>.column>.content>.head>* {- margin-right: 4px;-}-#issue-boards>.body>.column>.content>.head>.badge {- margin-right: 0;+#issue-boards>.body>.column>.content>.head a {+ color: #666;+ margin-right: 8px;}#issue-boards>.body>.column>.content>.body {@@ -148,57 +146,20 @@text-decoration: none;}-.board-card-detail {- padding: 20px;-}-.board-card-detail>.head {- font-size: 16px;- font-weight: bold;- border-bottom: 1px solid #E0E0E0;- padding-bottom: 20px;- margin-bottom: 20px;-}-.board-card-detail>.head {- padding-right: 28px;-}-.board-card-detail>.head>.number {- margin-right: 8px;-}-.board-card-detail>.head>.close {- position: absolute;- top: 20px;- right: 20px;-}-.board-card-detail>.head>.close {- font-family: sans-serif;-}-.board-card-detail>.head .state {- border-radius: 3px;- padding: 3px 6px;+.board-card-detail>.modal-header .number {+ margin-right: 4px;}-.board-card-detail>.body>* {+.board-card-detail>.modal-body>* {margin-bottom: 20px;}-.board-card-detail>.body>:last-child {+.board-card-detail>.modal-body>:last-child {margin-bottom: 0;}-.board-card-detail>.body>table>tbody>tr>td {- padding: 4px;+.board-card-detail>.modal-body>table>tbody>tr>td {+ padding: 6px;vertical-align: top;white-space: nowrap;}-.board-card-detail>.body>table>tbody>tr>td.name {- color: #666;- font-size: 12px;- line-height: 20px;-}-.board-card-detail>.body>table>tbody>tr>td.spacing {+.board-card-detail>.modal-body>table>tbody>tr>td.spacing {width: 20px;}-.board-card-detail>.body>table>tbody>tr>td.value>.state {- border-radius: 3px;- padding: 3px 6px;-}-.board-card-detail>.body>table>tbody>tr>td.value .avatar {- margin-left: 4px;-}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.htmlindex 8ecba18eec..bbbf0fe60b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html@@ -3,7 +3,7 @@<div class="main"><div wicket:id="title" class="title"></div><div class="state-and-actions clearfix">- <span wicket:id="state" class="state label pull-left"></span>+ <span wicket:id="state" class="pull-left"></span><div class="transition-actions pull-left"><wicket:enclosure child="transitions"><span class="btn-group">diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex 0d87cbdad3..534d7214d9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -54,7 +54,6 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanelimport io.onedev.server.OneDev;import io.onedev.server.exception.OneException;import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.IssueVoteManager;import io.onedev.server.manager.IssueWatchManager;@@ -76,10 +75,10 @@ import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.dateinput.DateInput;-import io.onedev.server.web.component.IssueStateLabel;import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.comment.CommentInput;import io.onedev.server.web.component.comment.ProjectAttachmentSupport;+import io.onedev.server.web.component.issuestate.IssueStateLabel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.milestoneprogress.MilestoneProgressBar;@@ -276,8 +275,9 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overridepublic void onClick(AjaxRequestTarget target) {Fragment fragment = new Fragment(ACTION_OPTIONS_ID, "transitionFrag", IssueDetailPage.this);- Serializable fieldBean = getIssueFieldUnaryManager().readFields(getIssue());- Set<String> excludedFields = getIssueFieldUnaryManager().getExcludedProperties(getIssue(), transition.getToState());+ Class<?> fieldBeanClass = getProject().defineIssueFieldBeanClass(true);+ Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass);+ Collection<String> excludedFields = getIssue().getExcludedFields(fieldBean.getClass(), transition.getToState());Form<?> form = new Form<Void>("form") {@@ -321,7 +321,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexif (toStateSpec == null)throw new OneException("Unable to find state spec: " + transition.getToState());- getIssueChangeManager().changeState(getIssue(), transition.getToState(), fieldBean,+ getIssueChangeManager().changeState(getIssue(), transition.getToState(), fieldBean,toStateSpec.getFields(), comment);setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue(), position));@@ -593,7 +593,8 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexFragment fragment = new Fragment(id, "fieldEditFrag", IssueDetailPage.this);Form<?> form = new Form<Void>("form");- Serializable fieldBean = OneDev.getInstance(IssueFieldUnaryManager.class).readFields(getIssue());+ Class<?> fieldBeanClass = getProject().defineIssueFieldBeanClass(true);+ Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass);Map<String, PropertyDescriptor> propertyDescriptors =new BeanDescriptor(fieldBean.getClass()).getMapOfDisplayNameToPropertyDescriptor();@@ -1028,10 +1029,6 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexreturn OneDev.getInstance(IssueChangeManager.class);}- private IssueFieldUnaryManager getIssueFieldUnaryManager() {- return OneDev.getInstance(IssueFieldUnaryManager.class);- }-private IssueManager getIssueManager() {return OneDev.getInstance(IssueManager.class);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.cssindex c305928800..4d4e29aa45 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css@@ -27,9 +27,10 @@font-weight: normal;font-size: 14px;}-#issue-detail>.main>.state-and-actions>.state {- font-size: 20px;- font-weight: normal;+#issue-detail>.main>.state-and-actions>.issue-state {+ font-size: 16px;+ display: block;+ padding: 4px 8px;}#issue-detail>.main>.state-and-actions>* {margin-right: 20px;@@ -67,6 +68,9 @@#issue-detail>.side>div>.body a.avatar {margin-right: 8px;}+#issue-detail>.side>div>.body .field-values a.avatar {+ margin-right: 0;+}#issue-detail>.side {position: fixed;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.htmlindex 0e1fcfdef7..37a1e359a1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.html@@ -23,12 +23,14 @@</form></wicket:fragment><wicket:fragment wicket:id="confirmCloseWithoutOpenIssuesFrag">- <div class="modal-body">- <h4>Do you really want to close milestone "<span wicket:id="milestone"></span>"?</h4>- </div>- <div class="modal-footer clearfix">- <a wicket:id="ok" class="btn btn-primary">Ok</a>- <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ <div class="confirm-box">+ <div class="content">+ Do you really want to close milestone "<span wicket:id="milestone"></span>"?+ </div>+ <div class="actions">+ <a wicket:id="ok" class="btn btn-primary">Ok</a>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div></div></wicket:fragment><wicket:fragment wicket:id="confirmDeleteWithIssuesFrag">@@ -49,12 +51,14 @@</form></wicket:fragment><wicket:fragment wicket:id="confirmDeleteWithoutIssuesFrag">- <div class="modal-body">- <h4>Do you really want to delete milestone "<span wicket:id="milestone"></span>"?</h4>- </div>- <div class="modal-footer clearfix">- <a wicket:id="ok" class="btn btn-primary">Ok</a>- <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ <div class="confirm-box">+ <div class="content">+ Do you really want to delete milestone "<span wicket:id="milestone"></span>"?+ </div>+ <div class="actions">+ <a wicket:id="ok" class="btn btn-primary">Ok</a>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div></div></wicket:fragment></wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.htmlindex dcdc5bce41..e0bd1c47ee 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.html@@ -3,22 +3,7 @@<div class="head">Create Issue</div><div class="body"><form wicket:id="form" class="leave-confirm">- <div class="form-group">- <label class="control-label">Title <span class="required">*</span></label>- <input wicket:id="title" type="text" class="form-control" placeholder="Input title here">- <div wicket:id="titleFeedback"></div>- </div>- <div class="form-group">- <label class="control-label">Description</label>- <div wicket:id="description"></div>- </div>- <div class="form-group">- <label class="control-label">Milestone</label>- <div>- <input wicket:id="milestone" type="hidden" class="form-group"></input>- </div>- </div>- <div wicket:id="fields"></div>+ <div wicket:id="newIssue"></div><button type="submit" class="btn btn-primary dirty-aware">Save</button></form></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.javaindex 1e6966643c..e456a76111 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java@@ -1,37 +1,25 @@package io.onedev.server.web.page.project.issues.newissue;-import java.io.Serializable;-import java.util.Date;import java.util.List;-import java.util.Set;-import java.util.stream.Collectors;import org.apache.wicket.RestartResponseAtInterceptPageException;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.model.PropertyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.web.component.comment.CommentInput;-import io.onedev.server.web.component.comment.ProjectAttachmentSupport;-import io.onedev.server.web.component.markdown.AttachmentSupport;-import io.onedev.server.web.component.stringchoice.StringSingleChoice;-import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.component.newissue.NewIssueEditor;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;import io.onedev.server.web.page.security.LoginPage;@@ -41,9 +29,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {private static final String PARAM_QUERY = "query";- private String queryString;-- private String milestoneName;+ private IModel<IssueCriteria> templateModel;public NewIssuePage(PageParameters params) {super(params);@@ -52,98 +38,53 @@ public class NewIssuePage extends ProjectPage implements InputContext {if (currentUser == null)throw new RestartResponseAtInterceptPageException(LoginPage.class);- queryString = params.get(PARAM_QUERY).toString();- }-- private IssueManager getIssueManager() {- return OneDev.getInstance(IssueManager.class);- }-- private IssueFieldUnaryManager getIssueFieldUnaryManager() {- return OneDev.getInstance(IssueFieldUnaryManager.class);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Issue issue = new Issue();- issue.setProject(getProject());- Serializable fieldBean = getIssueFieldUnaryManager().readFields(issue);-- if (queryString != null) {- try {- IssueQuery query = IssueQuery.parse(getProject(), queryString, true);- if (query.getCriteria() != null)- query.getCriteria().populate(issue, fieldBean);- } catch (Exception e) {- }- }- issue.setSubmitDate(new Date());- issue.setState(getProject().getIssueWorkflow().getInitialStateSpec().getName());- issue.setSubmitter(getLoginUser());-- milestoneName = issue.getMilestoneName();-- Form<?> form = new Form<Void>("form") {+ String queryString = params.get(PARAM_QUERY).toString();+ templateModel = new LoadableDetachableModel<IssueCriteria>() {@Override- protected void onSubmit() {- super.onSubmit();- issue.setProject(getProject());- issue.setSubmitter(getLoginUser());- issue.setMilestone(getProject().getMilestone(milestoneName));- getIssueManager().open(issue, fieldBean);- setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));+ protected IssueCriteria load() {+ try {+ IssueQuery query = IssueQuery.parse(getProject(), queryString, true);+ return query.getCriteria();+ } catch (Exception e) {+ return null;+ }}};-- TextField<String> titleInput = new TextField<String>("title", new PropertyModel<String>(issue, "title"));- titleInput.setRequired(true).setLabel(Model.of("Title"));- form.add(titleInput);- form.add(new FencedFeedbackPanel("titleFeedback", titleInput));-- titleInput.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ }- @Override- public String getObject() {- return !titleInput.isValid()?" has-error":"";- }-- }));-- form.add(new CommentInput("description", new PropertyModel<String>(issue, "description"), false) {+ @Override+ protected void onDetach() {+ templateModel.detach();+ super.onDetach();+ }- @Override- protected AttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(getProject(), issue.getUUID());- }+ @Override+ protected void onInitialize() {+ super.onInitialize();++ NewIssueEditor editor = new NewIssueEditor("newIssue") {@Overrideprotected Project getProject() {return NewIssuePage.this.getProject();}- });-- List<String> milestones = getProject().getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());- StringSingleChoice choice = new StringSingleChoice("milestone",- new PropertyModel<String>(this, "milestoneName"), milestones) {+ };+ Form<?> form = new Form<Void>("form") {@Override- protected void onInitialize() {- super.onInitialize();- getSettings().setPlaceholder("No milestone");+ protected void onSubmit() {+ super.onSubmit();+ Issue issue = editor.getConvertedInput();+ OneDev.getInstance(IssueManager.class).open(issue);+ setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));}};- choice.setRequired(false);- form.add(choice);- Set<String> excludedFields = getIssueFieldUnaryManager().getExcludedProperties(issue,- getProject().getIssueWorkflow().getInitialStateSpec().getName());- form.add(BeanContext.editBean("fields", fieldBean, excludedFields));+ form.add(editor);add(form);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.css b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.cssindex 20176d1a73..bd2c351556 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/newissue/new-issue.css@@ -5,6 +5,3 @@#new-issue>.body>div {margin-bottom: 20px;}-#new-issue>.body .select2-container {- width: 100%;-}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.htmlindex 4a248f25ca..7f43aea95c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.html@@ -106,13 +106,9 @@</form></wicket:fragment><wicket:fragment wicket:id="completedFrag">- <div class="completed">- <div class="modal-header">- <h4 id="modal-title" class="modal-title">- Workflow Reconciliation Completed- </h4>- </div>- <div class="modal-footer">+ <div class="message-box">+ <div class="content">Workflow Reconciliation Completed</div>+ <div class="actions"><a wicket:id="ok" class="btn btn-default">Ok</a></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/user/TaskListPage.java b/core/src/main/java/io/onedev/server/web/page/user/TaskListPage.javaindex 05b4dc3b42..2121505b2e 100644--- a/core/src/main/java/io/onedev/server/web/page/user/TaskListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/TaskListPage.java@@ -31,11 +31,11 @@ import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.WebConstants;-import io.onedev.server.web.component.IssueStateLabel;import io.onedev.server.web.component.RequestStatusLabel;import io.onedev.server.web.component.datatable.EntityDataProvider;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;+import io.onedev.server.web.component.issuestate.IssueStateLabel;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;diff --git a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.html b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.htmlindex 503a7de88f..dc2081b1e1 100644--- a/core/src/main/java/io/onedev/server/web/page/user/UserListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/user/UserListPage.html@@ -14,8 +14,8 @@</div></div><wicket:fragment wicket:id="nameFrag">- <a wicket:id="avatarLink"></a>- <a wicket:id="nameLink"></a>+ <a wicket:id="avatarLink" class="avatar"></a>+ <a wicket:id="nameLink" class="name"></a></wicket:fragment><wicket:fragment wicket:id="actionFrag"><a wicket:id="profile" title="Profile of this user"><i class="fa fa-cog"></i></a>diff --git a/core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java b/core/src/main/java/org/apache/wicket/application/AbstractClassResolver.javaindex 226b1c69fc..4ac101ec46 100644--- a/core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java+++ b/core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java@@ -29,8 +29,7 @@ import org.apache.wicket.Application;import org.apache.wicket.WicketRuntimeException;import org.apache.wicket.util.collections.UrlExternalFormComparator;-import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueFieldUnaryManager;+import io.onedev.server.model.Project;/*** An abstract implementation of a {@link IClassResolver} which uses a {@link ClassLoader} for@@ -59,7 +58,7 @@ public abstract class AbstractClassResolver implements IClassResolver@Overridepublic final Class<?> resolveClass(final String className) throws ClassNotFoundException{- Class<?> clazz = OneDev.getInstance(IssueFieldUnaryManager.class).loadFieldBeanClass(className, true);+ Class<?> clazz = Project.loadIssueFieldBeanClass(className);if (clazz != null)return clazz;