The Unified and Autonomous Development Platform
Remove project owner concept for simplicity. Refactor issue workflow reconciliation
Robin Shende2c35cbcdb8
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.javaindex 5a94a3b6fd..b0f4b44aeb 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.java@@ -42,7 +42,7 @@ public class Authentication implements Serializable {@SuppressWarnings("unused")private static List<String> getPasswordSecretChoices() {- return Project.get().getBuildSetting().getHierarchySecrets(Project.get())+ return Project.get().getBuildSetting().getJobSecrets().stream().map(it->it.getName()).collect(Collectors.toList());}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.javaindex f66c87bde4..1b04bde93a 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java@@ -20,7 +20,6 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.issue.fieldsupply.FieldSupply;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.util.SecurityUtils;@@ -83,7 +82,7 @@ public class CreateIssueAction extends PostBuildAction {}private static Collection<String> getFieldNames() {- return Project.get().getIssueSetting().getPromptFieldsUponIssueOpen(true);+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getPromptFieldsUponIssueOpen();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex 6724860e30..e8d8b1c3b1 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java@@ -14,9 +14,9 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.util.MilestoneAndState;import io.onedev.server.util.ProjectScopedNumber;-import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;public interface IssueManager extends EntityManager<Issue> {@@ -49,7 +49,7 @@ public interface IssueManager extends EntityManager<Issue> {Collection<UndefinedFieldValue> getUndefinedFieldValues();- void fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits);+ void fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions);void fixFieldValueOrders();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.javaindex 18b6c366dd..c68b82eedb 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/RoleManager.java@@ -1,20 +1,29 @@package io.onedev.server.entitymanager;+import java.util.Collection;+import java.util.Map;+import javax.annotation.Nullable;import io.onedev.server.model.Role;import io.onedev.server.persistence.dao.EntityManager;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;public interface RoleManager extends EntityManager<Role> {++ void replicate(Role role);+void save(Role role, @Nullable String oldName);@NullableRole find(String name);+ Role getManager();+void setupDefaults();- void onRenameIssueField(String oldName, String newName);+ Collection<String> getUndefinedIssueFields();- void onDeleteIssueField(String fieldName);+ void fixUndefinedIssueFields(Map<String, UndefinedFieldResolution> resolutions);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.javaindex 88e8762a6a..efbf757f7d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/UserManager.java@@ -25,6 +25,8 @@ public interface UserManager extends EntityManager<User> {*/void save(User user, @Nullable String oldName);+ void replicate(User user);+void delete(User user);/**diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex f70d54838c..01b2116fda 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -570,7 +570,7 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementspublic void run() {for (Project project: projectManager.query()) {logger.debug("Populating preserved build ids of project '" + project.getName() + "'...");- List<BuildPreservation> preservations = project.getBuildSetting().getHierarchyBuildPreservations(project);+ List<BuildPreservation> preservations = project.getBuildSetting().getBuildPreservations();if (preservations.isEmpty()) {idsToPreserve.addAll(queryIds(project, new BuildQuery(), 0, Integer.MAX_VALUE));} else {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex 1e48095cb7..0cb0fa9342 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -30,12 +30,14 @@ import com.google.common.base.Optional;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.LockUtils;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.build.BuildFinished;import io.onedev.server.event.issue.IssueChangeEvent;@@ -242,6 +244,10 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange}}+ private List<TransitionSpec> getTransitionSpecs() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getTransitionSpecs();+ }+@Transactional@Listenpublic void on(BuildFinished event) {@@ -266,7 +272,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangetry {SecurityUtils.bindAsSystem();Build build = buildManager.load(buildId);- for (TransitionSpec transition: build.getProject().getIssueSetting().getTransitionSpecs(true)) {+ for (TransitionSpec transition: getTransitionSpecs()) {if (transition.getTrigger() instanceof BuildSuccessfulTrigger) {Project project = build.getProject();BuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) transition.getTrigger();@@ -335,7 +341,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeMatcher matcher = new PathMatcher();PullRequest request = pullRequestManager.load(requestId);Project project = request.getTargetProject();- for (TransitionSpec transition: project.getIssueSetting().getTransitionSpecs(true)) {+ for (TransitionSpec transition: getTransitionSpecs()) {if (transition.getTrigger().getClass() == triggerClass) {PullRequestTrigger trigger = (PullRequestTrigger) transition.getTrigger();if (trigger.getBranches() == null || PatternSet.parse(trigger.getBranches()).matches(matcher, request.getTargetBranch())) {@@ -457,7 +463,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangebreak;}}- for (TransitionSpec transition: project.getIssueSetting().getTransitionSpecs(true)) {+ for (TransitionSpec transition: getTransitionSpecs()) {if (transition.getTrigger() instanceof BranchUpdateTrigger) {BranchUpdateTrigger trigger = (BranchUpdateTrigger) transition.getTrigger();String branches = trigger.getBranches();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 227034749a..d7a1d32c6f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -39,6 +39,7 @@ import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.IssueQuerySettingManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.entity.EntityRemoved;@@ -75,11 +76,11 @@ import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.MilestoneAndState;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.facade.IssueFacade;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;@Singleton@@ -101,6 +102,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsprivate final TransactionManager transactionManager;+ private final RoleManager roleManager;+private final Map<Long, IssueFacade> issues = new HashMap<>();private final ReadWriteLock issuesLock = new ReentrantReadWriteLock();@@ -109,7 +112,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementspublic DefaultIssueManager(Dao dao, IssueFieldManager issueFieldManager,TransactionManager transactionManager, IssueQuerySettingManager issueQuerySettingManager,SettingManager settingManager, ListenerRegistry listenerRegistry,- ProjectManager projectManager, UserManager userManager) {+ ProjectManager projectManager, UserManager userManager, RoleManager roleManager) {super(dao);this.issueFieldManager = issueFieldManager;this.issueQuerySettingManager = issueQuerySettingManager;@@ -118,6 +121,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsthis.projectManager = projectManager;this.transactionManager = transactionManager;this.userManager = userManager;+ this.roleManager = roleManager;}@SuppressWarnings("unchecked")@@ -300,12 +304,13 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Overridepublic Collection<String> getUndefinedStates() {+ Collection<String> undefinedStates = getIssueSetting().getUndefinedStates();+Query<String> query = getSession().createQuery("select distinct state from Issue");- Collection<String> undefinedStates = new HashSet<>(query.getResultList());- for (Iterator<String> it = undefinedStates.iterator(); it.hasNext();) {- if (getIssueSetting().getStateSpec(it.next()) != null)- it.remove();+ for (String state: query.getResultList()) {+ if (getIssueSetting().getStateSpec(state) == null)+ undefinedStates.add(state);}for (Project project: projectManager.query())@@ -330,96 +335,140 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}}- @Transactional+ @SuppressWarnings("unchecked")+ @Sessional@Override- public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {- for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {- Query<?> query = getSession().createQuery("update Issue set state=:newState where state=:oldState");- query.setParameter("oldState", entry.getKey());- query.setParameter("newState", entry.getValue().getNewState());- query.executeUpdate();- }+ public Collection<String> getUndefinedFields() {+ Collection<String> undefinedFields = getIssueSetting().getUndefinedFields();+ undefinedFields.addAll(roleManager.getUndefinedIssueFields());+ Query<String> query = getSession().createQuery("select distinct name from IssueField");+ for (String fieldName: query.getResultList()) {+ FieldSpec field = getIssueSetting().getFieldSpec(fieldName);+ if (field == null)+ undefinedFields.add(fieldName);+ }+for (Project project: projectManager.query())- project.getIssueSetting().fixUndefinedStates(project, resolutions);+ undefinedFields.addAll(project.getIssueSetting().getUndefinedFields(project));for (IssueQuerySetting setting: issueQuerySettingManager.query())- fixUndefinedStates(setting.getProject(), resolutions, setting.getUserQueries());-- for (User user: userManager.query())- fixUndefinedStates(null, resolutions, user.getIssueQuerySetting().getUserQueries());+ populateUndefinedFields(undefinedFields, setting.getProject(), setting.getUserQueries());++ for (User user: userManager.query())+ populateUndefinedFields(undefinedFields, null, user.getIssueQuerySetting().getUserQueries());++ return undefinedFields;}- private void fixUndefinedStates(@Nullable Project project, Map<String, UndefinedStateResolution> resolutions,- List<NamedIssueQuery> namedQueries) {+ private void populateUndefinedFields(Collection<String> undefinedFields,+ @Nullable Project project, List<NamedIssueQuery> namedQueries) {for (NamedIssueQuery namedQuery: namedQueries) {try {- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);- for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())- query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());- namedQuery.setQuery(query.toString());+ undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFields());} catch (Exception e) {}}-}+ @SuppressWarnings({ "unchecked", "rawtypes" })@Sessional@Override- public List<Issue> query(Project project, String term, int count) {- EntityCriteria<Issue> criteria = newCriteria();+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ Collection<UndefinedFieldValue> undefinedFieldValues = getIssueSetting().getUndefinedFieldValues();- Set<Project> projects = Sets.newHashSet(project);- projects.addAll(project.getForkParents().stream().filter(it->SecurityUtils.canAccess(it)).collect(Collectors.toSet()));- criteria.add(Restrictions.in(Issue.PROP_PROJECT, projects));+ Query query = getSession().createQuery("select distinct name, value from IssueField where type=:choice");+ query.setParameter("choice", FieldSpec.ENUMERATION);+ for (Object[] row: (List<Object[]>)query.getResultList()) {+ String fieldName = (String) row[0];+ String fieldValue = (String) row[1];+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(fieldName));+ if (specifiedChoices != null && fieldValue != null+ && !specifiedChoices.getChoiceValues().contains(fieldValue)) {+ undefinedFieldValues.add(new UndefinedFieldValue(fieldName, fieldValue));+ }+ }++ for (Project project: projectManager.query())+ undefinedFieldValues.addAll(project.getIssueSetting().getUndefinedFieldValues(project));- if (term.startsWith("#"))- term = term.substring(1);- if (term.length() != 0) {+ for (IssueQuerySetting setting: issueQuerySettingManager.query())+ populateUndefinedFieldValues(undefinedFieldValues, setting.getProject(), setting.getUserQueries());++ for (User user: userManager.query())+ populateUndefinedFieldValues(undefinedFieldValues, null, user.getIssueQuerySetting().getUserQueries());++ return undefinedFieldValues;+ }++ private void populateUndefinedFieldValues(Collection<UndefinedFieldValue> undefinedFieldValues,+ @Nullable Project project, List<NamedIssueQuery> namedQueries) {+ for (NamedIssueQuery namedQuery: namedQueries) {try {- long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq(Issue.PROP_NUMBER, buildNumber));- } catch (NumberFormatException e) {- criteria.add(Restrictions.or(- Restrictions.ilike(Issue.PROP_TITLE, term, MatchMode.ANYWHERE),- Restrictions.ilike(Issue.PROP_NO_SPACE_TITLE, term, MatchMode.ANYWHERE)));+ undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFieldValues());+ } catch (Exception e) {}}-- criteria.addOrder(Order.desc(Issue.PROP_PROJECT));- criteria.addOrder(Order.desc(Issue.PROP_NUMBER));- return query(criteria, 0, count);}- @SuppressWarnings("unchecked")- @Sessional+ @Transactional@Override- public Collection<String> getUndefinedFields() {- Query<?> query = getSession().createQuery("select distinct name from IssueField");- Set<String> undefinedFields = new HashSet<>();- for (String fieldName: (List<String>)query.getResultList()) {- FieldSpec field = getIssueSetting().getFieldSpec(fieldName);- if (field == null)- undefinedFields.add(fieldName);+ public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ getIssueSetting().fixUndefinedStates(resolutions);++ for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {+ if (entry.getValue().getFixType() == UndefinedStateResolution.FixType.CHANGE_TO_ANOTHER_STATE) {+ Query<?> query = getSession().createQuery("update Issue set state=:newState where state=:oldState");+ query.setParameter("oldState", entry.getKey());+ query.setParameter("newState", entry.getValue().getNewState());+ query.executeUpdate();+ } else {+ Query<?> query = getSession().createQuery("delete from IssueField where issue in (select issue from Issue issue where issue.state=:state)");+ query.setParameter("state", entry.getKey());+ query.executeUpdate();++ query = getSession().createQuery("delete from IssueComment where issue in (select issue from Issue issue where issue.state=:state)");+ query.setParameter("state", entry.getKey());+ query.executeUpdate();++ query = getSession().createQuery("delete from IssueChange where issue in (select issue from Issue issue where issue.state=:state)");+ query.setParameter("state", entry.getKey());+ query.executeUpdate();++ query = getSession().createQuery("delete from IssueVote where issue in (select issue from Issue issue where issue.state=:state)");+ query.setParameter("state", entry.getKey());+ query.executeUpdate();++ query = getSession().createQuery("delete from IssueWatch where issue in (select issue from Issue issue where issue.state=:state)");+ query.setParameter("state", entry.getKey());+ query.executeUpdate();++ query = getSession().createQuery("delete from Issue where state=:state");+ query.setParameter("state", entry.getKey());+ query.executeUpdate();+ }}-+for (Project project: projectManager.query())- undefinedFields.addAll(project.getIssueSetting().getUndefinedFields(project));+ project.getIssueSetting().fixUndefinedStates(project, resolutions);for (IssueQuerySetting setting: issueQuerySettingManager.query())- populateUndefinedFields(undefinedFields, setting.getProject(), setting.getUserQueries());-- for (User user: userManager.query())- populateUndefinedFields(undefinedFields, null, user.getIssueQuerySetting().getUserQueries());-- return undefinedFields;+ fixUndefinedStates(setting.getProject(), resolutions, setting.getUserQueries());++ for (User user: userManager.query())+ fixUndefinedStates(null, resolutions, user.getIssueQuerySetting().getUserQueries());}- private void populateUndefinedFields(Collection<String> undefinedFields,- @Nullable Project project, List<NamedIssueQuery> namedQueries) {- for (NamedIssueQuery namedQuery: namedQueries) {+ private void fixUndefinedStates(@Nullable Project project, Map<String, UndefinedStateResolution> resolutions,+ List<NamedIssueQuery> namedQueries) {+ for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();try {- undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFields());+ IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);+ if (parsedQuery.fixUndefinedStates(resolutions))+ it.remove();+ else+ namedQuery.setQuery(parsedQuery.toString());} catch (Exception e) {}}@@ -428,6 +477,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Transactional@Overridepublic void fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {+ roleManager.fixUndefinedIssueFields(resolutions);+for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {Query<?> query;if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {@@ -442,13 +493,18 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}for (Project project: projectManager.query())- project.getIssueSetting().fixUndefinedFields(resolutions);+ project.getIssueSetting().fixUndefinedFields(project, resolutions);for (IssueQuerySetting setting: issueQuerySettingManager.query())fixUndefinedFields(resolutions, setting.getProject(), setting.getUserQueries());for (User user: userManager.query())fixUndefinedFields(resolutions, null, user.getIssueQuerySetting().getUserQueries());++ Map<String, UndefinedFieldResolution> derivedDeletions =+ getFieldResolutions(getIssueSetting().fixUndefinedFields(resolutions));+ if (!derivedDeletions.isEmpty())+ fixUndefinedFields(derivedDeletions);}private void fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions,@@ -456,60 +512,11 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsfor (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);- boolean remove = false;- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {- UndefinedFieldResolution resolution = entry.getValue();- if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {- query.onRenameField(entry.getKey(), resolution.getNewField());- } else if (query.onDeleteField(entry.getKey())) {- remove = true;- break;- }- }- if (remove)+ IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);+ if (parsedQuery.fixUndefinedFields(resolutions))it.remove();else- namedQuery.setQuery(query.toString());- } catch (Exception e) {- }- }- }-- @SuppressWarnings({ "unchecked", "rawtypes" })- @Sessional- @Override- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {- Query query = getSession().createQuery("select distinct name, value from IssueField where type=:choice");- query.setParameter("choice", FieldSpec.ENUMERATION);- Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();- for (Object[] row: (List<Object[]>)query.getResultList()) {- String fieldName = (String) row[0];- String fieldValue = (String) row[1];- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(fieldName));- if (specifiedChoices != null && fieldValue != null- && !specifiedChoices.getChoiceValues().contains(fieldValue)) {- undefinedFieldValues.add(new UndefinedFieldValue(fieldName, fieldValue));- }- }-- for (Project project: projectManager.query())- undefinedFieldValues.addAll(project.getIssueSetting().getUndefinedFieldValues(project));-- for (IssueQuerySetting setting: issueQuerySettingManager.query())- populateUndefinedFieldValues(undefinedFieldValues, setting.getProject(), setting.getUserQueries());-- for (User user: userManager.query())- populateUndefinedFieldValues(undefinedFieldValues, null, user.getIssueQuerySetting().getUserQueries());-- return undefinedFieldValues;- }-- private void populateUndefinedFieldValues(Collection<UndefinedFieldValue> undefinedFieldValues,- @Nullable Project project, List<NamedIssueQuery> namedQueries) {- for (NamedIssueQuery namedQuery: namedQueries) {- try {- undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFieldValues());+ namedQuery.setQuery(parsedQuery.toString());} catch (Exception e) {}}@@ -518,17 +525,17 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@SuppressWarnings("rawtypes")@Transactional@Override- public void fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {- for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {- for (String deletion: entry.getValue().getDeletions()) {+ public void fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {+ for (Map.Entry<String, UndefinedFieldValuesResolution> resolutionEntry: resolutions.entrySet()) {+ for (String deletion: resolutionEntry.getValue().getDeletions()) {Query query = getSession().createQuery("delete from IssueField where name=:fieldName and value=:fieldValue");- query.setParameter("fieldName", entry.getKey());+ query.setParameter("fieldName", resolutionEntry.getKey());query.setParameter("fieldValue", deletion);query.executeUpdate();}- for (Map.Entry<String, String> renameEntry: entry.getValue().getRenames().entrySet()) {+ for (Map.Entry<String, String> renameEntry: resolutionEntry.getValue().getRenames().entrySet()) {Query query = getSession().createQuery("update IssueField set value=:newValue where name=:fieldName and value=:oldValue");- query.setParameter("fieldName", entry.getKey());+ query.setParameter("fieldName", resolutionEntry.getKey());query.setParameter("oldValue", renameEntry.getKey());query.setParameter("newValue", renameEntry.getValue());query.executeUpdate();@@ -536,23 +543,28 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}for (Project project: projectManager.query()) {- project.getIssueSetting().fixUndefinedFieldValues(project, valueSetEdits);+ project.getIssueSetting().fixUndefinedFieldValues(project, resolutions);}for (IssueQuerySetting setting: issueQuerySettingManager.query())- fixUndefinedFieldValues(valueSetEdits, setting.getProject(), setting.getUserQueries());+ fixUndefinedFieldValues(resolutions, setting.getProject(), setting.getUserQueries());for (User user: userManager.query())- fixUndefinedFieldValues(valueSetEdits, null, user.getIssueQuerySetting().getUserQueries());+ fixUndefinedFieldValues(resolutions, null, user.getIssueQuerySetting().getUserQueries());++ Map<String, UndefinedFieldResolution> derivedDeletions =+ getFieldResolutions(getIssueSetting().fixUndefinedFieldValues(resolutions));+ if (!derivedDeletions.isEmpty())+ fixUndefinedFields(derivedDeletions);}- private void fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits,+ private void fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions,@Nullable Project project, List<NamedIssueQuery> namedQueries) {for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);- if (query.fixUndefinedFieldValues(valueSetEdits))+ if (query.fixUndefinedFieldValues(resolutions))it.remove();elsenamedQuery.setQuery(query.toString());@@ -586,6 +598,43 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}}+ private Map<String, UndefinedFieldResolution> getFieldResolutions(Collection<String> deletedFields) {+ Map<String, UndefinedFieldResolution> resolutions = new HashMap<>();+ for (String field: deletedFields) {+ UndefinedFieldResolution resolution = new UndefinedFieldResolution();+ resolution.setFixType(UndefinedFieldResolution.FixType.DELETE_THIS_FIELD);+ resolutions.put(field, resolution);+ }+ return resolutions;+ }++ @Sessional+ @Override+ public List<Issue> query(Project project, String term, int count) {+ EntityCriteria<Issue> criteria = newCriteria();++ Set<Project> projects = Sets.newHashSet(project);+ projects.addAll(project.getForkParents().stream().filter(it->SecurityUtils.canAccess(it)).collect(Collectors.toSet()));+ criteria.add(Restrictions.in(Issue.PROP_PROJECT, projects));++ if (term.startsWith("#"))+ term = term.substring(1);+ if (term.length() != 0) {+ try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq(Issue.PROP_NUMBER, buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.or(+ Restrictions.ilike(Issue.PROP_TITLE, term, MatchMode.ANYWHERE),+ Restrictions.ilike(Issue.PROP_NO_SPACE_TITLE, term, MatchMode.ANYWHERE)));+ }+ }++ criteria.addOrder(Order.desc(Issue.PROP_PROJECT));+ criteria.addOrder(Order.desc(Issue.PROP_NUMBER));+ return query(criteria, 0, count);+ }+@Transactional@Overridepublic void delete(Issue issue) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 8d6c3189df..839f0ad21e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -14,12 +14,14 @@ import java.util.Map;import java.util.Optional;import java.util.concurrent.ConcurrentHashMap;import java.util.stream.Collectors;+import javax.inject.Inject;import javax.inject.Singleton;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;+import org.apache.commons.io.IOUtils;import org.apache.shiro.authz.Permission;import org.eclipse.jgit.api.Git;@@ -37,7 +39,9 @@ import org.quartz.ScheduleBuilder;import org.quartz.SimpleScheduleBuilder;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import com.google.common.base.Preconditions;+import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;@@ -46,7 +50,9 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserAuthorizationManager;import io.onedev.server.event.ProjectCreated;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.RefUpdated;@@ -111,6 +117,10 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>private final ListenerRegistry listenerRegistry;+ private final RoleManager roleManager;++ private final UserAuthorizationManager userAuthorizationManager;+private final String gitReceiveHook;private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();@@ -124,7 +134,8 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>BuildManager buildManager, AvatarManager avatarManager, GroupManager groupManager,SettingManager settingManager, TransactionManager transactionManager,SessionManager sessionManager, ListenerRegistry listenerRegistry,- TaskScheduler taskScheduler) {+ TaskScheduler taskScheduler, UserAuthorizationManager userAuthorizationManager,+ RoleManager roleManager) {super(dao);this.commitInfoManager = commitInfoManager;@@ -136,6 +147,8 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>this.sessionManager = sessionManager;this.listenerRegistry = listenerRegistry;this.taskScheduler = taskScheduler;+ this.userAuthorizationManager = userAuthorizationManager;+ this.roleManager = roleManager;try (InputStream is = getClass().getClassLoader().getResourceAsStream("git-receive-hook")) {Preconditions.checkNotNull(is);@@ -188,7 +201,11 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>public void create(Project project) {dao.persist(project);checkSanity(project);-+ UserAuthorization authorization = new UserAuthorization();+ authorization.setProject(project);+ authorization.setUser(SecurityUtils.getUser());+ authorization.setRole(roleManager.getManager());+ userAuthorizationManager.save(authorization);listenerRegistry.post(new ProjectCreated(project));}@@ -267,6 +284,13 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>@Overridepublic void fork(Project from, Project to) {dao.persist(to);++ UserAuthorization authorization = new UserAuthorization();+ authorization.setProject(to);+ authorization.setUser(SecurityUtils.getUser());+ authorization.setRole(roleManager.getManager());+ userAuthorizationManager.save(authorization);+FileUtils.cleanDir(to.getGitDir());new CloneCommand(to.getGitDir()).mirror(true).from(from.getGitDir().getAbsolutePath()).call();checkSanity(to);@@ -387,8 +411,6 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>it.remove();}- usage.add(project.getIssueSetting().onDeleteBranch(branchName));-usage.prefix("project setting").checkInUse("Branch '" + branchName + "'");}@@ -494,7 +516,6 @@ public class DefaultProjectManager extends AbstractEntityManager<Project>} else {User user = SecurityUtils.getUser();if (user != null) {- projects.addAll(user.getProjects());for (Membership membership: user.getMemberships()) {for (GroupAuthorization authorization: membership.getGroup().getProjectAuthorizations()) {if (authorization.getRole().implies(permission))diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.javaindex e32682a2ce..5ee5a92fd8 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultRoleManager.java@@ -1,53 +1,63 @@package io.onedev.server.entitymanager.impl;+import java.util.Collection;+import java.util.HashSet;import java.util.List;+import java.util.Map;import javax.inject.Inject;import javax.inject.Singleton;+import org.hibernate.ReplicationMode;import org.hibernate.criterion.Restrictions;-import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.Project;import io.onedev.server.model.Role;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.role.AllIssueFields;-import io.onedev.server.model.support.role.ExcludeIssueFields;import io.onedev.server.model.support.role.CodePrivilege;+import io.onedev.server.model.support.role.ExcludeIssueFields;+import io.onedev.server.model.support.role.IncludeIssueFields;import io.onedev.server.model.support.role.IssueFieldSet;import io.onedev.server.model.support.role.JobPrivilege;import io.onedev.server.model.support.role.NoneIssueFields;-import io.onedev.server.model.support.role.IncludeIssueFields;+import io.onedev.server.persistence.IdManager;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.persistence.dao.EntityCriteria;import io.onedev.server.util.Usage;+import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;@Singletonpublic class DefaultRoleManager extends AbstractEntityManager<Role> implements RoleManager {private final SettingManager settingManager;- private final ProjectManager projectManager;+ private final IdManager idManager;@Inject- public DefaultRoleManager(Dao dao, SettingManager settingManager, ProjectManager projectManager) {+ public DefaultRoleManager(Dao dao, SettingManager settingManager, IdManager idManager) {super(dao);this.settingManager = settingManager;- this.projectManager = projectManager;+ this.idManager = idManager;}+ @Transactional+ @Override+ public void replicate(Role role) {+ getSession().replicate(role, ReplicationMode.OVERWRITE);+ idManager.useId(Role.class, role.getId());+ }+@Transactional@Overridepublic void save(Role role, String oldName) {- if (oldName != null && !oldName.equals(role.getName())) {- for (Project project: projectManager.query())- project.getIssueSetting().onRenameRole(oldName, role.getName());+ if (oldName != null && !oldName.equals(role.getName()))settingManager.getIssueSetting().onRenameRole(oldName, role.getName());- }dao.persist(role);}@@ -55,10 +65,6 @@ public class DefaultRoleManager extends AbstractEntityManager<Role> implements R@Overridepublic void delete(Role role) {Usage usage = new Usage();- for (Project project: projectManager.query()) {- usage.add(project.getIssueSetting().onDeleteRole(role.getName()));- usage.prefix("project '" + project.getName() + "': setting");- }usage.add(settingManager.getIssueSetting().onDeleteRole(role.getName()).prefix("administration"));@@ -88,11 +94,6 @@ public class DefaultRoleManager extends AbstractEntityManager<Role> implements R@Transactionalpublic void setupDefaults() {- Role manager = new Role();- manager.setName("Manager");- manager.setManageProject(true);- save(manager, null);-Role developer = new Role();developer.setName("Developer");developer.setCodePrivilege(CodePrivilege.WRITE);@@ -133,40 +134,62 @@ public class DefaultRoleManager extends AbstractEntityManager<Role> implements Rsave(reporter, null);}+ @Sessional+ @Override+ public Role getManager() {+ return load(Role.MANAGER_ID);+ }+@Override- public void onRenameIssueField(String oldName, String newName) {+ public Collection<String> getUndefinedIssueFields() {+ Collection<String> undefinedFields = new HashSet<>();+ GlobalIssueSetting issueSetting = settingManager.getIssueSetting();for (Role role: query()) {IssueFieldSet fieldSet = role.getEditableIssueFields();if (fieldSet instanceof ExcludeIssueFields) {- ExcludeIssueFields allIssueFieldsExcept = (ExcludeIssueFields) fieldSet;- if (allIssueFieldsExcept.getExcludeFields().remove(oldName))- allIssueFieldsExcept.getExcludeFields().add(newName);- if (allIssueFieldsExcept.getExcludeFields().isEmpty())- role.setEditableIssueFields(new AllIssueFields());+ ExcludeIssueFields excludeIssueFields = (ExcludeIssueFields) fieldSet;+ for (String fieldName: excludeIssueFields.getExcludeFields()) {+ if (issueSetting.getFieldSpec(fieldName) == null)+ undefinedFields.add(fieldName);+ }} else if (fieldSet instanceof IncludeIssueFields) {- IncludeIssueFields specifiedIssueFields = (IncludeIssueFields) fieldSet;- if (specifiedIssueFields.getIncludeFields().remove(oldName))- specifiedIssueFields.getIncludeFields().add(newName);- if (specifiedIssueFields.getIncludeFields().isEmpty())- role.setEditableIssueFields(new NoneIssueFields());+ IncludeIssueFields includeIssueFields = (IncludeIssueFields) fieldSet;+ for (String fieldName: includeIssueFields.getIncludeFields()) {+ if (issueSetting.getFieldSpec(fieldName) == null)+ undefinedFields.add(fieldName);+ }}}++ return undefinedFields;}@Override- public void onDeleteIssueField(String fieldName) {+ public void fixUndefinedIssueFields(Map<String, UndefinedFieldResolution> resolutions) {for (Role role: query()) {- IssueFieldSet fieldSet = role.getEditableIssueFields();- if (fieldSet instanceof ExcludeIssueFields) {- ExcludeIssueFields exludeIssueFields = (ExcludeIssueFields) fieldSet;- exludeIssueFields.getExcludeFields().remove(fieldName);- if (exludeIssueFields.getExcludeFields().isEmpty())- role.setEditableIssueFields(new AllIssueFields());- } else if (fieldSet instanceof IncludeIssueFields) {- IncludeIssueFields includeIssueFields = (IncludeIssueFields) fieldSet;- includeIssueFields.getIncludeFields().remove(fieldName);- if (includeIssueFields.getIncludeFields().isEmpty())- role.setEditableIssueFields(new NoneIssueFields());+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {+ IssueFieldSet fieldSet = role.getEditableIssueFields();+ if (fieldSet instanceof ExcludeIssueFields) {+ ExcludeIssueFields excludeIssueFields = (ExcludeIssueFields) fieldSet;+ if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {+ ReconcileUtils.renameItem(excludeIssueFields.getExcludeFields(),+ entry.getKey(), entry.getValue().getNewField());+ } else {+ excludeIssueFields.getExcludeFields().remove(entry.getKey());+ }+ if (excludeIssueFields.getExcludeFields().isEmpty())+ role.setEditableIssueFields(new AllIssueFields());+ } else if (fieldSet instanceof IncludeIssueFields) {+ IncludeIssueFields includeIssueFields = (IncludeIssueFields) fieldSet;+ if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {+ ReconcileUtils.renameItem(includeIssueFields.getIncludeFields(),+ entry.getKey(), entry.getValue().getNewField());+ } else {+ includeIssueFields.getIncludeFields().remove(entry.getKey());+ }+ if (includeIssueFields.getIncludeFields().isEmpty())+ role.setEditableIssueFields(new NoneIssueFields());+ }}}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.javaindex 1499defefb..71a7341c53 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java@@ -13,17 +13,16 @@ import org.hibernate.ReplicationMode;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;-import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.server.entitymanager.IssueFieldManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.TagProtection;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;+import io.onedev.server.persistence.IdManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;@@ -40,28 +39,30 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uprivate final IssueFieldManager issueFieldManager;- private final ListenerRegistry listenerRegistry;+ private final IdManager idManager;@Injectpublic DefaultUserManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,- IssueFieldManager issueFieldManager, ListenerRegistry listenerRegistry) {+ IssueFieldManager issueFieldManager, IdManager idManager) {super(dao);this.projectManager = projectManager;this.settingManager = settingManager;this.issueFieldManager = issueFieldManager;- this.listenerRegistry = listenerRegistry;+ this.idManager = idManager;}+ @Transactional+ @Override+ public void replicate(User user) {+ getSession().replicate(user, ReplicationMode.OVERWRITE);+ idManager.useId(User.class, user.getId());+ }+@Transactional@Overridepublic void save(User user, String oldName) {- if (user.isRoot() || user.isSystem()) {- getSession().replicate(user, ReplicationMode.OVERWRITE);- listenerRegistry.post(new EntityPersisted(user, false));- } else {- dao.persist(user);- }+ dao.persist(user);if (oldName != null && !oldName.equals(user.getName())) {for (Project project: projectManager.query()) {diff --git a/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/issue/BoardSpec.javaindex eb22a30926..b56b27ca4e 100644--- a/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/issue/BoardSpec.java@@ -23,14 +23,15 @@ import io.onedev.server.issue.fieldspec.ChoiceField;import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.issue.fieldspec.GroupChoiceField;import io.onedev.server.issue.fieldspec.UserChoiceField;+import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.util.EditContext;-import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.model.Issue;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;import io.onedev.server.web.component.stringchoice.StringChoiceProvider;import io.onedev.server.web.editable.annotation.ChoiceProvider;@@ -200,19 +201,7 @@ public class BoardSpec implements Serializable {return -1;}- private Set<String> getUndefinedStates(Project project, @Nullable String query) {- Set<String> undefinedStates = new HashSet<>();- if (query != null) {- try {- undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(- project, query, false, true, true, true, true).getUndefinedStates());- } catch (Exception e) {- }- }- return undefinedStates;- }-- public Set<String> getUndefinedStates(Project project) {+ public Set<String> getUndefinedStates(@Nullable Project project) {Set<String> undefinedStates = new HashSet<>();undefinedStates.addAll(getUndefinedStates(project, getBaseQuery()));undefinedStates.addAll(getUndefinedStates(project, getBacklogBaseQuery()));@@ -226,50 +215,19 @@ public class BoardSpec implements Serializable {return undefinedStates;}- private String fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions,- @Nullable String query) {- if (query != null) {- try {- io.onedev.server.search.entity.issue.IssueQuery parsedQuery =- io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);- for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())- parsedQuery.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());- return parsedQuery.toString();- } catch (Exception e) {- }- }- return query;- }-- public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {- setBaseQuery(fixUndefinedStates(project, resolutions, getBaseQuery()));- setBacklogBaseQuery(fixUndefinedStates(project, resolutions, getBacklogBaseQuery()));- if (getIdentifyField().equals(Issue.FIELD_STATE)) {- for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {- int index = getColumns().indexOf(entry.getKey());- if (index != -1) {- if (getColumns().contains(entry.getValue().getNewState()))- getColumns().remove(index);- else- getColumns().set(index, entry.getValue().getNewState());- }- }- }- }-- private Set<String> getUndefinedFields(Project project, @Nullable String query) {- Set<String> undefinedFields = new HashSet<>();+ private Set<String> getUndefinedStates(@Nullable Project project, @Nullable String query) {+ Set<String> undefinedStates = new HashSet<>();if (query != null) {try {- undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery- .parse(project, query, false, true, true, true, true).getUndefinedFields());+ undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(+ project, query, false, true, true, true, true).getUndefinedStates());} catch (Exception e) {}}- return undefinedFields;+ return undefinedStates;}- public Set<String> getUndefinedFields(Project project) {+ public Set<String> getUndefinedFields(@Nullable Project project) {Set<String> undefinedFields = new HashSet<>();undefinedFields.addAll(getUndefinedFields(project, getBaseQuery()));undefinedFields.addAll(getUndefinedFields(project, getBacklogBaseQuery()));@@ -288,256 +246,184 @@ public class BoardSpec implements Serializable {return undefinedFields;}- @Nullable- private String fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions, @Nullable String query) {+ private Set<String> getUndefinedFields(@Nullable Project project, @Nullable String query) {+ Set<String> undefinedFields = new HashSet<>();if (query != null) {try {- io.onedev.server.search.entity.issue.IssueQuery parsedQuery =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, query, false, true, true, true, true);- boolean remove = false;- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {- UndefinedFieldResolution resolution = entry.getValue();- if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {- parsedQuery.onRenameField(entry.getKey(), resolution.getNewField());- } else if (parsedQuery.onDeleteField(entry.getKey())) {- remove = true;- break;- }- }- return remove?null:parsedQuery.toString();+ undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery+ .parse(project, query, false, true, true, true, true).getUndefinedFields());} catch (Exception e) {}}- return query;+ return undefinedFields;}- public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {- setBaseQuery(fixUndefinedFields(resolutions, getBaseQuery()));- setBacklogBaseQuery(fixUndefinedFields(resolutions, getBacklogBaseQuery()));-- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {- UndefinedFieldResolution resolution = entry.getValue();- if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {- if (getIdentifyField().equals(entry.getKey()))- setIdentifyField(resolution.getNewField());- int index = getDisplayFields().indexOf(entry.getKey());- if (index != -1) {- if (getDisplayFields().contains(resolution.getNewField()))- getDisplayFields().remove(index);- else- getDisplayFields().set(index, resolution.getNewField());+ public Collection<UndefinedFieldValue> getUndefinedFieldValues(@Nullable Project project) {+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();+ if (!identifyField.equals(Issue.FIELD_STATE)) {+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(identifyField));+ if (specifiedChoices != null) {+ for (String column: getColumns()) {+ if (column != null && !specifiedChoices.getChoiceValues().contains(column))+ undefinedFieldValues.add(new UndefinedFieldValue(identifyField, column));}- } else {- getDisplayFields().remove(entry.getKey());- if (getIdentifyField().equals(entry.getKey()))- return true;- }- }- return false;- }-- public boolean fixUndefinedFieldValues(@Nullable Project project, Map<String, ValueSetEdit> valueSetEdits) {- for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {- if (onEditFieldValues(project, entry.getKey(), entry.getValue()))- return true;- }- return false;- }-- public static String getWebSocketObservable(Long projectId) {- return BoardSpec.class.getName() + ":" + projectId;- }-- public void onRenameUser(GlobalIssueSetting issueSetting, String oldName, String newName) {- FieldSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());- if (fieldSpec instanceof UserChoiceField) {- for (int i=0; i<getColumns().size(); i++) {- if (getColumns().get(i).equals(oldName))- getColumns().set(i, newName);}}+ undefinedFieldValues.addAll(getUndefinedFieldValues(project, getBaseQuery()));+ undefinedFieldValues.addAll(getUndefinedFieldValues(project, getBacklogBaseQuery()));+ return undefinedFieldValues;}-- public boolean onDeleteUser(GlobalIssueSetting issueSetting, String userName) {- FieldSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());- if (fieldSpec instanceof UserChoiceField) {- for (Iterator<String> it = getColumns().iterator(); it.hasNext();) {- if (it.next().equals(userName))- it.remove();- }- }- if (getColumns().size() < 2)- return true;- else- return false;- }-- @Nullable- private String onRenameField(String oldName, String newName, @Nullable String query) {++ private Collection<UndefinedFieldValue> getUndefinedFieldValues(@Nullable Project project, @Nullable String query) {+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();if (query != null) {try {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, query, false, true, true, true, true);- parsedQuery.onRenameField(oldName, newName);- return parsedQuery.toString();+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);+ undefinedFieldValues.addAll(parsedQuery.getUndefinedFieldValues());} catch (Exception e) {}}- return query;+ return undefinedFieldValues;}- public void onRenameField(String oldName, String newName) {- if (getIdentifyField().equals(oldName))- setIdentifyField(newName);- int index = getDisplayFields().indexOf(oldName);- if (index != -1) {- if (getDisplayFields().contains(newName))- getDisplayFields().remove(index);- else- getDisplayFields().set(index, newName);+ public boolean fixUndefinedStates(@Nullable Project project, Map<String, UndefinedStateResolution> resolutions) {+ setBaseQuery(fixUndefinedStates(project, resolutions, getBaseQuery()));+ setBacklogBaseQuery(fixUndefinedStates(project, resolutions, getBacklogBaseQuery()));+ if (getIdentifyField().equals(Issue.FIELD_STATE)) {+ for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {+ if (entry.getValue().getFixType() == UndefinedStateResolution.FixType.CHANGE_TO_ANOTHER_STATE)+ ReconcileUtils.renameItem(getColumns(), entry.getKey(), entry.getValue().getNewState());+ else+ getColumns().remove(entry.getKey());+ if (getColumns().size() < 2)+ return true;+ }}- setBaseQuery(onRenameField(oldName, newName, getBaseQuery()));- setBacklogBaseQuery(onRenameField(oldName, newName, getBacklogBaseQuery()));+ return false;}- @Nullable- private String onRenameState(String oldName, String newName, @Nullable String query) {+ private String fixUndefinedStates(@Nullable Project project, Map<String, UndefinedStateResolution> resolutions,+ @Nullable String query) {if (query != null) {try {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, query, false, true, true, true, true);- parsedQuery.onRenameState(oldName, newName);- return parsedQuery.toString();+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);+ if (parsedQuery.fixUndefinedStates(resolutions))+ query = null;+ else+ query = parsedQuery.toString();} catch (Exception e) {}}return query;}- public void onRenameState(String oldName, String newName) {- if (getIdentifyField().equals(Issue.FIELD_STATE)) {- int index = getColumns().indexOf(oldName);- if (index != -1) {- if (getColumns().contains(newName))- getColumns().remove(index);- else- getColumns().set(index, newName);- }- }+ @Nullable+ public boolean fixUndefinedFields(@Nullable Project project, Map<String, UndefinedFieldResolution> resolutions) {+ setBaseQuery(fixUndefinedFields(project, resolutions, getBaseQuery()));+ setBacklogBaseQuery(fixUndefinedFields(project, resolutions, getBacklogBaseQuery()));- setBaseQuery(onRenameState(oldName, newName, getBaseQuery()));- setBacklogBaseQuery(onRenameState(oldName, newName, getBacklogBaseQuery()));+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {+ UndefinedFieldResolution resolution = entry.getValue();+ if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {+ if (getIdentifyField().equals(entry.getKey()))+ setIdentifyField(resolution.getNewField());+ int index = getDisplayFields().indexOf(entry.getKey());+ if (index != -1) {+ if (getDisplayFields().contains(resolution.getNewField()))+ getDisplayFields().remove(index);+ else+ getDisplayFields().set(index, resolution.getNewField());+ }+ } else {+ getDisplayFields().remove(entry.getKey());+ if (getIdentifyField().equals(entry.getKey()))+ return true;+ }+ }+ return false;}- @Nullable- private String onDeleteField(String fieldName, @Nullable String query) {+ private String fixUndefinedFields(@Nullable Project project, Map<String, UndefinedFieldResolution> resolutions,+ @Nullable String query) {if (query != null) {try {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, query, false, true, true, true, true);- if (parsedQuery.onDeleteField(fieldName))- return null;+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);+ if (parsedQuery.fixUndefinedFields(resolutions))+ query = null;else- return parsedQuery.toString();+ query = parsedQuery.toString();} catch (Exception e) {}}return query;}- public boolean onDeleteField(String fieldName) {- getDisplayFields().remove(fieldName);- setBaseQuery(onDeleteField(fieldName, getBaseQuery()));- setBacklogBaseQuery(onDeleteField(fieldName, getBacklogBaseQuery()));- return getIdentifyField().equals(fieldName);- }-- @Nullable- private String onDeleteState(String stateName, @Nullable String query) {- if (query != null) {- try {- io.onedev.server.search.entity.issue.IssueQuery parsedQuery =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, query, false, true, true, true, true);- if (parsedQuery.onDeleteState(stateName))- return null;- else- return parsedQuery.toString();- } catch (Exception e) {+ public boolean fixUndefinedFieldValues(@Nullable Project project, Map<String, UndefinedFieldValuesResolution> resolutions) {+ setBaseQuery(fixUndefinedFieldValues(project, resolutions, getBaseQuery()));+ setBacklogBaseQuery(fixUndefinedFieldValues(project, resolutions, getBacklogBaseQuery()));+ for (Map.Entry<String, UndefinedFieldValuesResolution> resolutionEntry: resolutions.entrySet()) {+ if (resolutionEntry.getKey().equals(getIdentifyField())) {+ getColumns().removeAll(resolutionEntry.getValue().getDeletions());+ for (Map.Entry<String, String> renameEntry: resolutionEntry.getValue().getRenames().entrySet()) {+ int index = getColumns().indexOf(renameEntry.getKey());+ if (index != -1) {+ if (getColumns().contains(renameEntry.getValue()))+ getColumns().remove(index);+ else+ getColumns().set(index, renameEntry.getValue());+ }+ }}}- return query;- }-- public boolean onDeleteState(String stateName) {- if (getIdentifyField().equals(Issue.FIELD_STATE))- getColumns().remove(stateName);- setBaseQuery(onDeleteState(stateName, getBaseQuery()));- setBacklogBaseQuery(onDeleteState(stateName, getBacklogBaseQuery()));-return getColumns().size() < 2;}-+@Nullable- private String onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit, @Nullable String query) {+ private String fixUndefinedFieldValues(@Nullable Project project, Map<String, UndefinedFieldValuesResolution> resolutions,+ @Nullable String query) {if (query != null) {try {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, query, false, true, true, true, true);- if (parsedQuery.onEditFieldValues(fieldName, valueSetEdit))- return null;+ io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);+ if (parsedQuery.fixUndefinedFieldValues(resolutions))+ query = null;else- return parsedQuery.toString();+ query = parsedQuery.toString();} catch (Exception e) {}}return query;}- public boolean onEditFieldValues(@Nullable Project project, String fieldName, ValueSetEdit valueSetEdit) {- if (fieldName.equals(getIdentifyField())) {- getColumns().removeAll(valueSetEdit.getDeletions());- for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {- int index = getColumns().indexOf(entry.getKey());- if (index != -1) {- if (getColumns().contains(entry.getValue()))- getColumns().remove(index);- else- getColumns().set(index, entry.getValue());- }- }- }- setBaseQuery(onEditFieldValues(fieldName, valueSetEdit, getBaseQuery()));- setBacklogBaseQuery(onEditFieldValues(fieldName, valueSetEdit, getBacklogBaseQuery()));- return getColumns().size() < 2;+ public static String getWebSocketObservable(Long projectId) {+ return BoardSpec.class.getName() + ":" + projectId;}- private Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project, @Nullable String query) {- Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();- if (query != null) {- try {- io.onedev.server.search.entity.issue.IssueQuery parsedQuery =- io.onedev.server.search.entity.issue.IssueQuery.parse(project, query, false, true, true, true, true);- undefinedFieldValues.addAll(parsedQuery.getUndefinedFieldValues());- } catch (Exception e) {+ public void onRenameUser(GlobalIssueSetting issueSetting, String oldName, String newName) {+ FieldSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());+ if (fieldSpec instanceof UserChoiceField) {+ for (int i=0; i<getColumns().size(); i++) {+ if (getColumns().get(i).equals(oldName))+ getColumns().set(i, newName);}}- return undefinedFieldValues;}-- public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {- Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();- if (!identifyField.equals(Issue.FIELD_STATE)) {- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(identifyField));- if (specifiedChoices != null) {- for (String column: getColumns()) {- if (column != null && !specifiedChoices.getChoiceValues().contains(column))- undefinedFieldValues.add(new UndefinedFieldValue(identifyField, column));- }++ public boolean onDeleteUser(GlobalIssueSetting issueSetting, String userName) {+ FieldSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());+ if (fieldSpec instanceof UserChoiceField) {+ for (Iterator<String> it = getColumns().iterator(); it.hasNext();) {+ if (it.next().equals(userName))+ it.remove();}}- undefinedFieldValues.addAll(getUndefinedFieldValues(project, getBaseQuery()));- undefinedFieldValues.addAll(getUndefinedFieldValues(project, getBacklogBaseQuery()));- return undefinedFieldValues;+ if (getColumns().size() < 2)+ return true;+ else+ return false;}-+}diff --git a/server-core/src/main/java/io/onedev/server/issue/TransitionSpec.java b/server-core/src/main/java/io/onedev/server/issue/TransitionSpec.javaindex 5b939f8657..360ab436ad 100644--- a/server-core/src/main/java/io/onedev/server/issue/TransitionSpec.java+++ b/server-core/src/main/java/io/onedev/server/issue/TransitionSpec.java@@ -4,7 +4,6 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;-import java.util.Iterator;import java.util.List;import java.util.Map;@@ -21,14 +20,14 @@ import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.issue.transitiontrigger.TransitionTrigger;import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.Usage;-import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution.FixType;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;@@ -110,83 +109,6 @@ public class TransitionSpec implements Serializable {return trigger.onDeleteRole(roleName).prefix("trigger");}- public void onRenameState(String oldName, String newName) {- int index = fromStates.indexOf(oldName);- if (index != -1) {- if (fromStates.contains(newName))- fromStates.remove(index);- else- fromStates.set(index, newName);- }- if (toState.equals(oldName))- toState = newName;- trigger.onRenameState(oldName, newName);- }-- public void onRenameField(String oldName, String newName) {- int index = getRemoveFields().indexOf(oldName);- if (index != -1) {- if (getRemoveFields().contains(newName))- getRemoveFields().remove(index);- else- getRemoveFields().set(index, newName);- }- trigger.onRenameField(oldName, newName);- }-- public boolean onDeleteField(String fieldName) {- if (getTrigger().onDeleteField(fieldName))- return true;-- for (Iterator<String> it = getRemoveFields().iterator(); it.hasNext();) {- if (it.next().equals(fieldName))- it.remove();- }-- return false;- }-- public boolean onDeleteState(String stateName) {- fromStates.remove(stateName);- if (fromStates.isEmpty() || toState.equals(stateName))- return true;- else- return trigger.onDeleteState(stateName);- }-- public Collection<String> getUndefinedFields(Project project) {- Collection<String> undefinedFields = new HashSet<>();- GlobalIssueSetting setting = OneDev.getInstance(SettingManager.class).getIssueSetting();- undefinedFields.addAll(getTrigger().getUndefinedFields());- for (String field: getRemoveFields()) {- if (setting.getFieldSpec(field) == null)- undefinedFields.add(field);- }- return undefinedFields;- }-- public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {- if (entry.getValue().getFixType() == FixType.CHANGE_TO_ANOTHER_FIELD)- onRenameField(entry.getKey(), entry.getValue().getNewField());- else if (onDeleteField(entry.getKey()))- return true;- }- return false;- }-- public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {- return trigger.onEditFieldValues(fieldName, valueSetEdit);- }-- public boolean fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {- for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {- if (onEditFieldValues(entry.getKey(), entry.getValue()))- return true;- }- return false;- }-@SuppressWarnings("unused")private static List<String> getStateChoices() {List<String> stateNames = new ArrayList<>();@@ -218,10 +140,6 @@ public class TransitionSpec implements Serializable {return OneDev.getInstance(SettingManager.class).getIssueSetting();}- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {- return trigger.getUndefinedFieldValues();- }-public Collection<? extends String> getUndefinedStates() {Collection<String> undefinedStates = new HashSet<>();if (getIssueSetting().getStateSpec(toState) == null)@@ -234,9 +152,48 @@ public class TransitionSpec implements Serializable {return undefinedStates;}- public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {- for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet())- onRenameState(entry.getKey(), entry.getValue().getNewState());+ public Collection<String> getUndefinedFields() {+ Collection<String> undefinedFields = new HashSet<>();+ undefinedFields.addAll(getTrigger().getUndefinedFields());+ GlobalIssueSetting setting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ for (String field: getRemoveFields()) {+ if (setting.getFieldSpec(field) == null)+ undefinedFields.add(field);+ }+ return undefinedFields;+ }++ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ return trigger.getUndefinedFieldValues();}+ public boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {+ if (entry.getValue().getFixType() == UndefinedStateResolution.FixType.CHANGE_TO_ANOTHER_STATE) {+ ReconcileUtils.renameItem(fromStates, entry.getKey(), entry.getValue().getNewState());+ if (toState.equals(entry.getKey()))+ toState = entry.getValue().getNewState();+ } else {+ fromStates.remove(entry.getKey());+ if (fromStates.isEmpty() || toState.equals(entry.getKey()))+ return true;+ }+ }+ return trigger.fixUndefinedStates(resolutions);+ }++ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {+ if (entry.getValue().getFixType() == FixType.CHANGE_TO_ANOTHER_FIELD)+ ReconcileUtils.renameItem(getRemoveFields(), entry.getKey(), entry.getValue().getNewField());+ else+ getRemoveFields().remove(entry.getKey());+ }+ return trigger.fixUndefinedFields(resolutions);+ }++ public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {+ return trigger.fixUndefinedFieldValues(resolutions);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldspec/FieldSpec.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/FieldSpec.javaindex 204058214c..41270e95c2 100644--- a/server-core/src/main/java/io/onedev/server/issue/fieldspec/FieldSpec.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/FieldSpec.java@@ -1,13 +1,27 @@package io.onedev.server.issue.fieldspec;+import java.util.Collection;+import java.util.HashSet;+import java.util.Map;+import javax.validation.Valid;import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.util.EditContext;+import io.onedev.server.util.Usage;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.util.inputspec.showcondition.ShowCondition;+import io.onedev.server.util.inputspec.showcondition.ValueIsNotAnyOf;+import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;import io.onedev.server.util.validation.annotation.FieldName;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -101,4 +115,112 @@ public abstract class FieldSpec extends InputSpec {buffer.append(" @NameOfEmptyValue(\"" + escape(getNameOfEmptyValue()) + "\")");}+ private GlobalIssueSetting getIssueSetting() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting();+ }++ public Collection<String> getUndefinedFields() {+ Collection<String> undefinedFields = new HashSet<>();+ ShowCondition showCondition = getShowCondition();+ if (showCondition != null && getIssueSetting().getFieldSpec(showCondition.getInputName()) == null)+ undefinedFields.add(showCondition.getInputName());+ return undefinedFields;+ }++ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();+ ShowCondition showCondition = getShowCondition();+ if (showCondition != null) {+ FieldSpec field = getIssueSetting().getFieldSpec(showCondition.getInputName());+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(field);+ if (specifiedChoices != null) {+ if (showCondition.getValueMatcher() instanceof ValueIsOneOf) {+ ValueIsOneOf valueIsOneOf = (ValueIsOneOf) showCondition.getValueMatcher();+ for (String value: valueIsOneOf.getValues()) {+ if (!specifiedChoices.getChoiceValues().contains(value))+ undefinedFieldValues.add(new UndefinedFieldValue(field.getName(), value));+ }+ } else if (showCondition.getValueMatcher() instanceof ValueIsNotAnyOf) {+ ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) showCondition.getValueMatcher();+ for (String value: valueIsNotAnyOf.getValues()) {+ if (!specifiedChoices.getChoiceValues().contains(value))+ undefinedFieldValues.add(new UndefinedFieldValue(field.getName(), value));+ }+ }+ }+ }+ return undefinedFieldValues;+ }++ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {+ ShowCondition showCondition = getShowCondition();+ if (showCondition != null) {+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {+ if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {+ if (entry.getKey().equals(showCondition.getInputName()))+ showCondition.setInputName(entry.getValue().getNewField());+ } else if (showCondition.getInputName().equals(entry.getKey())) {+ return true;+ }+ }+ }+ return false;+ }++ public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {+ ShowCondition showCondition = getShowCondition();+ if (showCondition != null) {+ for (Map.Entry<String, UndefinedFieldValuesResolution> resolutionEntry: resolutions.entrySet()) {+ if (showCondition.getInputName().equals(resolutionEntry.getKey())) {+ if (showCondition.getValueMatcher() instanceof ValueIsOneOf) {+ ValueIsOneOf valueIsOneOf = (ValueIsOneOf) showCondition.getValueMatcher();+ valueIsOneOf.getValues().removeAll(resolutionEntry.getValue().getDeletions());+ for (Map.Entry<String, String> renameEntry: resolutionEntry.getValue().getRenames().entrySet()) {+ int index = valueIsOneOf.getValues().indexOf(renameEntry.getKey());+ if (index != -1) {+ if (valueIsOneOf.getValues().contains(renameEntry.getValue()))+ valueIsOneOf.getValues().remove(index);+ else+ valueIsOneOf.getValues().set(index, renameEntry.getValue());+ }+ }+ if (valueIsOneOf.getValues().isEmpty())+ return true;+ } else if (showCondition.getValueMatcher() instanceof ValueIsNotAnyOf) {+ ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) showCondition.getValueMatcher();+ valueIsNotAnyOf.getValues().removeAll(resolutionEntry.getValue().getDeletions());+ for (Map.Entry<String, String> renameEntry: resolutionEntry.getValue().getRenames().entrySet()) {+ int index = valueIsNotAnyOf.getValues().indexOf(renameEntry.getKey());+ if (index != -1) {+ if (valueIsNotAnyOf.getValues().contains(renameEntry.getValue()))+ valueIsNotAnyOf.getValues().remove(index);+ else+ valueIsNotAnyOf.getValues().set(index, renameEntry.getValue());+ }+ }+ if (valueIsNotAnyOf.getValues().isEmpty())+ return true;+ }+ }+ }+ }+ return false;+ }++ public void onRenameUser(String oldName, String newName) {++ }++ public void onRenameGroup(String oldName, String newName) {++ }++ public Usage onDeleteUser(String userName) {+ return new Usage();+ }++ public Usage onDeleteGroup(String groupName) {+ return new Usage();+ }+}diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PressButtonTrigger.javaindex cbdc43a542..3e405281d4 100644--- a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PressButtonTrigger.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/PressButtonTrigger.java@@ -2,8 +2,8 @@ package io.onedev.server.issue.transitiontrigger;import java.util.ArrayList;import java.util.Collection;-import java.util.Iterator;import java.util.List;+import java.util.Map;import org.hibernate.validator.constraints.NotEmpty;@@ -14,6 +14,8 @@ import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.Usage;+import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.IssueQuery;@@ -73,24 +75,25 @@ public class PressButtonTrigger extends TransitionTrigger {}@Override- public void onRenameField(String oldName, String newName) {- super.onRenameField(oldName, newName);- int index = getPromptFields().indexOf(oldName);- if (index != -1) {- if (getPromptFields().contains(newName))- getPromptFields().remove(index);- else- getPromptFields().set(index, newName);+ public Collection<String> getUndefinedFields() {+ Collection<String> undefinedFields = super.getUndefinedFields();+ GlobalIssueSetting setting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ for (String field: getPromptFields()) {+ if (setting.getFieldSpec(field) == null)+ undefinedFields.add(field);}+ return undefinedFields;}@Override- public boolean onDeleteField(String fieldName) {- if (super.onDeleteField(fieldName))+ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {+ if (super.fixUndefinedFields(resolutions))return true;- for (Iterator<String> it = getPromptFields().iterator(); it.hasNext();) {- if (it.next().equals(fieldName))- it.remove();+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {+ if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD)+ ReconcileUtils.renameItem(getPromptFields(), entry.getKey(), entry.getValue().getNewField());+ else+ getPromptFields().remove(entry.getKey());}return false;}@@ -110,17 +113,6 @@ public class PressButtonTrigger extends TransitionTrigger {return usage;}- @Override- public Collection<String> getUndefinedFields() {- Collection<String> undefinedFields = super.getUndefinedFields();- GlobalIssueSetting setting = OneDev.getInstance(SettingManager.class).getIssueSetting();- for (String field: getPromptFields()) {- if (setting.getFieldSpec(field) == null)- undefinedFields.add(field);- }- return undefinedFields;- }-public boolean isAuthorized(Project project) {if (!getAuthorizedRoles().isEmpty()) {if (SecurityUtils.canManageIssues(Project.get())) {diff --git a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/TransitionTrigger.java b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/TransitionTrigger.javaindex d41f6a3158..df769c353d 100644--- a/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/TransitionTrigger.java+++ b/server-core/src/main/java/io/onedev/server/issue/transitiontrigger/TransitionTrigger.java@@ -3,10 +3,13 @@ package io.onedev.server.issue.transitiontrigger;import java.io.Serializable;import java.util.Collection;import java.util.HashSet;+import java.util.Map;import io.onedev.server.util.Usage;-import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.IssueQuery;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -41,97 +44,72 @@ public abstract class TransitionTrigger implements Serializable {return new Usage();}- public void onRenameState(String oldName, String newName) {+ public Collection<String> getUndefinedStates() {try {- io.onedev.server.search.entity.issue.IssueQuery parsedQuery =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);- parsedQuery.onRenameState(oldName, newName);- issueQuery = parsedQuery.toString();+ return io.onedev.server.search.entity.issue.IssueQuery+ .parse(null, issueQuery, false, true, true, true, true).getUndefinedStates();} catch (Exception e) {+ return new HashSet<>();}}- public boolean onDeleteState(String stateName) {+ public Collection<String> getUndefinedFields() {try {- io.onedev.server.search.entity.issue.IssueQuery parsedQuery =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);- if (parsedQuery.onDeleteState(stateName)) {- return true;- } else {- issueQuery = parsedQuery.toString();- return false;- }+ return io.onedev.server.search.entity.issue.IssueQuery+ .parse(null, issueQuery, false, true, true, true, true).getUndefinedFields();} catch (Exception e) {- return false;+ e.printStackTrace();+ return new HashSet<>();}}- public void onRenameField(String oldName, String newName) {+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {try {- io.onedev.server.search.entity.issue.IssueQuery parsedQuery =- io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);- parsedQuery.onRenameField(oldName, newName);- issueQuery = parsedQuery.toString();+ return io.onedev.server.search.entity.issue.IssueQuery+ .parse(null, issueQuery, false, true, true, true, true).getUndefinedFieldValues();} catch (Exception e) {+ return new HashSet<>();}- }-- public boolean onDeleteField(String fieldName) {+ }++ public boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {try {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);- if (parsedQuery.onDeleteField(fieldName)) {+ if (parsedQuery.fixUndefinedStates(resolutions))return true;- } else {+ elseissueQuery = parsedQuery.toString();- return false;- }} catch (Exception e) {- return false;}+ return false;}-- public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {++ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {try {io.onedev.server.search.entity.issue.IssueQuery parsedQuery =io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);- if (parsedQuery.onEditFieldValues(fieldName, valueSetEdit)) {+ if (parsedQuery.fixUndefinedFields(resolutions))return true;- } else {+ elseissueQuery = parsedQuery.toString();- return false;- }- } catch (Exception e) {- return false;- }- }-- public Collection<String> getUndefinedStates() {- try {- return io.onedev.server.search.entity.issue.IssueQuery- .parse(null, issueQuery, false, true, true, true, true).getUndefinedStates();} catch (Exception e) {- return new HashSet<>();}+ return false;}-- public Collection<String> getUndefinedFields() {++ public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {try {- return io.onedev.server.search.entity.issue.IssueQuery- .parse(null, issueQuery, false, true, true, true, true).getUndefinedFields();+ io.onedev.server.search.entity.issue.IssueQuery parsedQuery =+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, issueQuery, false, true, true, true, true);+ if (parsedQuery.fixUndefinedFieldValues(resolutions))+ return true;+ else+ issueQuery = parsedQuery.toString();} catch (Exception e) {- return new HashSet<>();}+ return false;}-- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {- try {- return io.onedev.server.search.entity.issue.IssueQuery- .parse(null, issueQuery, false, true, true, true, true).getUndefinedFieldValues();- } catch (Exception e) {- return new HashSet<>();- }- }public abstract String getDescription();}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex 70f277d70f..7df8bde843 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -37,6 +37,7 @@ import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.system.SystemStarting;+import io.onedev.server.model.Role;import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.User;@@ -51,7 +52,6 @@ import io.onedev.server.model.support.administration.SshSettings;import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.model.support.administration.jobexecutor.AutoDiscoveredJobExecutor;import io.onedev.server.notification.MailManager;-import io.onedev.server.persistence.IdManager;import io.onedev.server.persistence.PersistManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -68,8 +68,6 @@ public class DefaultDataManager implements DataManager, Serializable {private final SettingManager settingManager;- private final IdManager idManager;-private final Validator validator;private final PersistManager persistManager;@@ -85,11 +83,11 @@ public class DefaultDataManager implements DataManager, Serializable {private String backupTaskId;private ServerConfig serverConfig;-+private ServerKeyPairPopulator keyPairPopulator;-+@Inject- public DefaultDataManager(IdManager idManager, UserManager userManager,+ public DefaultDataManager(UserManager userManager,SettingManager settingManager, PersistManager persistManager,MailManager mailManager, Validator validator, TaskScheduler taskScheduler,PasswordService passwordService, RoleManager roleManager,@@ -98,7 +96,6 @@ public class DefaultDataManager implements DataManager, Serializable {this.settingManager = settingManager;this.validator = validator;this.taskScheduler = taskScheduler;- this.idManager = idManager;this.persistManager = persistManager;this.mailManager = mailManager;this.passwordService = passwordService;@@ -119,7 +116,7 @@ public class DefaultDataManager implements DataManager, Serializable {system.setName(OneDev.NAME);system.setEmail("no email");system.setPassword("no password");- userManager.save(system, null);+ userManager.replicate(system);}User administrator = userManager.get(User.ROOT_ID);if (administrator == null) {@@ -137,8 +134,7 @@ public class DefaultDataManager implements DataManager, Serializable {public void complete() {User user = (User) getSetting();user.setPassword(passwordService.encryptPassword(user.getPassword()));- userManager.save(user, null);- idManager.init(User.class);+ userManager.replicate(user);}});@@ -272,8 +268,14 @@ public class DefaultDataManager implements DataManager, Serializable {});}- if (roleManager.count() == 0)+ if (roleManager.get(Role.MANAGER_ID) == null) {+ Role manager = new Role();+ manager.setName("Manager");+ manager.setId(Role.MANAGER_ID);+ manager.setManageProject(true);+ roleManager.replicate(manager);roleManager.setupDefaults();+ }return manualConfigs;}diff --git a/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.java b/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.javaindex 88f8432438..9b49172297 100644--- a/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.java+++ b/server-core/src/main/java/io/onedev/server/migration/VersionedYamlDoc.java@@ -166,8 +166,7 @@ public class VersionedYamlDoc extends MappingNode {Object propertyValue,Tag customTag) {if (propertyValue == null|| propertyValue instanceof Collection && ((Collection) propertyValue).isEmpty()- || propertyValue instanceof Map && ((Map) propertyValue).isEmpty()- || property.getName().equals("uuid")) { // exclude uuid from ChoiceParam.SpecifiedChoices.Choice+ || propertyValue instanceof Map && ((Map) propertyValue).isEmpty()) {return null;} else {return super.representJavaBeanProperty(javaBean, property, propertyValue, customTag);diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 9aedaef398..16ff95080e 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -640,7 +640,7 @@ public class Build extends AbstractEntity implements Referenceable {public Collection<String> getSecretValuesToMask() {Collection<String> secretValuesToMask = new HashSet<>();- for (JobSecret secret: getProject().getBuildSetting().getHierarchySecrets(getProject())) {+ for (JobSecret secret: getProject().getBuildSetting().getJobSecrets()) {if (secret.isAuthorized(getProject(), getCommitId()))secretValuesToMask.add(secret.getValue());}diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 19f30ea1d8..69a282fa85 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -147,10 +147,6 @@ public class Project extends AbstractEntity {public static final String PROP_DESCRIPTION = "description";- public static final String FIELD_OWNER = "Owner";-- public static final String PROP_OWNER = "owner";-public static final String PROP_ID = "id";public static final String PROP_FORKED_FROM = "forkedFrom";@@ -160,7 +156,6 @@ public class Project extends AbstractEntity {public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(FIELD_NAME, PROP_NAME,- FIELD_OWNER, PROP_OWNER,FIELD_UPDATE_DATE, PROP_UPDATE_DATE);private static final int LAST_COMMITS_CACHE_THRESHOLD = 1000;@@ -415,14 +410,6 @@ public class Project extends AbstractEntity {this.forkedFrom = forkedFrom;}- public User getOwner() {- return owner;- }-- public void setOwner(User owner) {- this.owner = owner;- }-public Collection<Project> getForks() {return forks;}@@ -1201,12 +1188,6 @@ public class Project extends AbstractEntity {this.webHooks = webHooks;}- public List<WebHook> getHierarchyWebHooks() {- List<WebHook> hierarchyWebHooks = new ArrayList<>(getWebHooks());- hierarchyWebHooks.addAll(getOwner().getWebHooks());- return hierarchyWebHooks;- }-public TagProtection getTagProtection(String tagName, User user) {boolean noCreation = false;boolean noDeletion = false;diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex 5639ccb460..b5ea3b0675 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -59,6 +59,8 @@ public class Role extends AbstractEntity implements Permission {private static final long serialVersionUID = 1L;+ public static final Long MANAGER_ID = 1L;+@Column(nullable=false, unique=true)private String name;@@ -101,6 +103,10 @@ public class Role extends AbstractEntity implements Permission {public void setName(String name) {this.name = name;}++ public boolean isManager() {+ return getId().equals(MANAGER_ID);+ }@Editable(order=200)public boolean isManageProject() {diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex c2633f35b6..90537292d7 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -6,6 +6,7 @@ import java.util.LinkedHashMap;import java.util.LinkedHashSet;import java.util.Stack;import java.util.stream.Collectors;+import javax.annotation.Nullable;import javax.persistence.CascadeType;import javax.persistence.Column;@@ -14,6 +15,7 @@ import javax.persistence.Index;import javax.persistence.Lob;import javax.persistence.OneToMany;import javax.persistence.Table;+import org.apache.shiro.authc.AuthenticationInfo;import org.apache.shiro.subject.PrincipalCollection;import org.apache.shiro.subject.SimplePrincipalCollection;@@ -23,14 +25,13 @@ import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.Email;import org.hibernate.validator.constraints.NotEmpty;+import com.fasterxml.jackson.annotation.JsonView;import com.google.common.base.MoreObjects;import io.onedev.server.model.support.NamedProjectQuery;import io.onedev.server.model.support.QuerySetting;-import io.onedev.server.model.support.WebHook;import io.onedev.server.model.support.build.NamedBuildQuery;-import io.onedev.server.model.support.build.UserBuildSetting;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.util.SecurityUtils;@@ -109,10 +110,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)private Collection<CodeCommentQuerySetting> projectCodeCommentQuerySettings = new ArrayList<>();- @OneToMany(mappedBy="owner")- @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)- private Collection<Project> projects = new ArrayList<>();-@OneToMany(mappedBy="owner", cascade=CascadeType.REMOVE)private Collection<SshKey> sshKeys = new ArrayList<>();@@ -156,15 +153,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Column(nullable=false, length=65535)private LinkedHashSet<String> buildQuerySubscriptions = new LinkedHashSet<>();- @Lob- @Column(length=65535, nullable=false)- private UserBuildSetting buildSetting = new UserBuildSetting();-- @Lob- @Column(length=65535, nullable=false)- @JsonView(DefaultView.class)- private ArrayList<WebHook> webHooks = new ArrayList<>();-private transient Collection<Group> groups;public QuerySetting<NamedProjectQuery> getProjectQuerySetting() {@@ -361,14 +349,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {return SecurityUtils.asSubject(getId());}- public Collection<Project> getProjects() {- return projects;- }-- public void setProjects(Collection<Project> projects) {- this.projects = projects;- }-@Editable(name="Login Name", order=100)@UserName@NotEmpty@@ -461,22 +441,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {public void setProjectAuthorizations(Collection<UserAuthorization> projectAuthorizations) {this.projectAuthorizations = projectAuthorizations;}-- public UserBuildSetting getBuildSetting() {- return buildSetting;- }-- public void setBuildSetting(UserBuildSetting buildSetting) {- this.buildSetting = buildSetting;- }-- public ArrayList<WebHook> getWebHooks() {- return webHooks;- }-- public void setWebHooks(ArrayList<WebHook> webHooks) {- this.webHooks = webHooks;- }@Overridepublic int compareTo(AbstractEntity entity) {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javaindex 750b627206..89349b3f9d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java@@ -9,16 +9,13 @@ import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import java.util.Set;import javax.annotation.Nullable;import com.google.common.collect.Lists;import edu.emory.mathcs.backport.java.util.Collections;-import io.onedev.server.OneDev;import io.onedev.server.OneException;-import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.issue.BoardSpec;import io.onedev.server.issue.StateSpec;import io.onedev.server.issue.TransitionSpec;@@ -30,16 +27,18 @@ import io.onedev.server.issue.transitiontrigger.BranchUpdateTrigger;import io.onedev.server.issue.transitiontrigger.BuildSuccessfulTrigger;import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.Usage;-import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.util.inputspec.showcondition.ShowCondition;import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;import io.onedev.server.web.editable.annotation.Editable;@Editable@@ -49,13 +48,13 @@ public class GlobalIssueSetting implements Serializable {private List<StateSpec> stateSpecs = new ArrayList<>();- private List<TransitionSpec> defaultTransitionSpecs = new ArrayList<>();+ private List<TransitionSpec> transitionSpecs = new ArrayList<>();private List<FieldSpec> fieldSpecs = new ArrayList<>();- private Collection<String> defaultPromptFieldsUponIssueOpen = new HashSet<>();+ private Collection<String> promptFieldsUponIssueOpen = new HashSet<>();- private List<BoardSpec> defaultBoardSpecs = new ArrayList<>();+ private List<BoardSpec> boardSpecs = new ArrayList<>();private List<String> listFields = new ArrayList<>();@@ -203,7 +202,7 @@ public class GlobalIssueSetting implements Serializable {BranchUpdateTrigger branchUpdateTrigger = new BranchUpdateTrigger();transition.setTrigger(branchUpdateTrigger);- defaultTransitionSpecs.add(transition);+ transitionSpecs.add(transition);transition = new TransitionSpec();transition.setFromStates(Lists.newArrayList("Open", "Committed"));@@ -213,7 +212,7 @@ public class GlobalIssueSetting implements Serializable {pressButton.setAuthorizedRoles(Lists.newArrayList("Developer", "Tester"));transition.setTrigger(pressButton);- defaultTransitionSpecs.add(transition);+ transitionSpecs.add(transition);transition = new TransitionSpec();transition.setFromStates(Lists.newArrayList("Open", "Committed"));@@ -223,7 +222,7 @@ public class GlobalIssueSetting implements Serializable {pressButton.setAuthorizedRoles(Lists.newArrayList("Developer", "Tester"));transition.setTrigger(pressButton);- defaultTransitionSpecs.add(transition);+ transitionSpecs.add(transition);transition = new TransitionSpec();transition.setFromStates(Lists.newArrayList("Open"));@@ -233,7 +232,7 @@ public class GlobalIssueSetting implements Serializable {buildSuccessful.setIssueQuery("\"Type\" is \"Build Failure\" and (\"Failed Build\" is current or \"Failed Build\" is previous)");transition.setTrigger(buildSuccessful);- defaultTransitionSpecs.add(transition);+ transitionSpecs.add(transition);transition = new TransitionSpec();transition.setFromStates(Lists.newArrayList("Open", "Committed"));@@ -243,7 +242,7 @@ public class GlobalIssueSetting implements Serializable {buildSuccessful.setIssueQuery("fixed in current build");transition.setTrigger(buildSuccessful);- defaultTransitionSpecs.add(transition);+ transitionSpecs.add(transition);transition = new TransitionSpec();transition.setFromStates(Lists.newArrayList("Committed", "Invalid", "Closed"));@@ -253,20 +252,20 @@ public class GlobalIssueSetting implements Serializable {pressButton.setAuthorizedRoles(Lists.newArrayList("Developer", "Tester"));transition.setTrigger(pressButton);- defaultTransitionSpecs.add(transition);+ transitionSpecs.add(transition);- defaultPromptFieldsUponIssueOpen.add("Type");- defaultPromptFieldsUponIssueOpen.add("Priority");- defaultPromptFieldsUponIssueOpen.add("Assignees");- defaultPromptFieldsUponIssueOpen.add("Failed Build");- defaultPromptFieldsUponIssueOpen.add("Seen Builds");+ promptFieldsUponIssueOpen.add("Type");+ promptFieldsUponIssueOpen.add("Priority");+ promptFieldsUponIssueOpen.add("Assignees");+ promptFieldsUponIssueOpen.add("Failed Build");+ promptFieldsUponIssueOpen.add("Seen Builds");BoardSpec board = new BoardSpec();board.setName(Issue.FIELD_STATE);board.setIdentifyField(Issue.FIELD_STATE);board.setColumns(Lists.newArrayList("Open", "Committed", "Closed"));board.setDisplayFields(Lists.newArrayList(Issue.FIELD_STATE, "Type", "Priority", "Assignees"));- defaultBoardSpecs.add(board);+ boardSpecs.add(board);listFields.add("Type");listFields.add("Priority");@@ -284,6 +283,7 @@ public class GlobalIssueSetting implements Serializable {namedQueries.add(new NamedIssueQuery("Committed", "\"State\" is \"Committed\""));namedQueries.add(new NamedIssueQuery("Closed", "\"State\" is \"Closed\""));namedQueries.add(new NamedIssueQuery("Invalid", "\"State\" is \"Invalid\""));+ namedQueries.add(new NamedIssueQuery("All", null));}public List<String> sortFieldNames(Collection<String> fieldNames) {@@ -308,12 +308,12 @@ public class GlobalIssueSetting implements Serializable {this.stateSpecs = stateSpecs;}- public List<TransitionSpec> getDefaultTransitionSpecs() {- return defaultTransitionSpecs;+ public List<TransitionSpec> getTransitionSpecs() {+ return transitionSpecs;}- public void setDefaultTransitionSpecs(List<TransitionSpec> defaultStateTransitions) {- this.defaultTransitionSpecs = defaultStateTransitions;+ public void setTransitionSpecs(List<TransitionSpec> transitionSpecs) {+ this.transitionSpecs = transitionSpecs;}@Editable@@ -325,12 +325,12 @@ public class GlobalIssueSetting implements Serializable {this.fieldSpecs = fieldSpecs;}- public Collection<String> getDefaultPromptFieldsUponIssueOpen() {- return defaultPromptFieldsUponIssueOpen;+ public Collection<String> getPromptFieldsUponIssueOpen() {+ return promptFieldsUponIssueOpen;}- public void setDefaultPromptFieldsUponIssueOpen(Collection<String> defaultPromptFieldsUponIssueOpen) {- this.defaultPromptFieldsUponIssueOpen = defaultPromptFieldsUponIssueOpen;+ public void setPromptFieldsUponIssueOpen(Collection<String> promptFieldsUponIssueOpen) {+ this.promptFieldsUponIssueOpen = promptFieldsUponIssueOpen;}public boolean isReconciled() {@@ -361,123 +361,137 @@ public class GlobalIssueSetting implements Serializable {return new ArrayList<>(getFieldSpecMap(null).keySet());}- public void onDeleteState(String stateName) {- for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {- if (it.next().onDeleteState(stateName))- it.remove();- }- for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {- if (it.next().onDeleteState(stateName))- it.remove();- }-- for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {- NamedIssueQuery namedQuery = it.next();+ @Nullable+ public StateSpec getStateSpec(String stateName) {+ return getStateSpecMap().get(stateName);+ }++ @Nullable+ public FieldSpec getFieldSpec(String fieldName) {+ return getFieldSpecMap(null).get(fieldName);+ }++ public Collection<String> getUndefinedStates() {+ Collection<String> undefinedStates = new HashSet<>();+ for (TransitionSpec transition: getTransitionSpecs())+ undefinedStates.addAll(transition.getUndefinedStates());+ for (BoardSpec board: getBoardSpecs())+ undefinedStates.addAll(board.getUndefinedStates(null));+ for (NamedIssueQuery namedQuery: getNamedQueries()) {try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);- if (query.onDeleteState(stateName))- it.remove();- else- namedQuery.setQuery(query.toString());+ undefinedStates.addAll(query.getUndefinedStates());} catch (Exception e) {}}+ return undefinedStates;}- public void onRenameState(String oldName, String newName) {- for (TransitionSpec transition: getDefaultTransitionSpecs())- transition.onRenameState(oldName, newName);- for (BoardSpec board: getDefaultBoardSpecs())- board.onRenameState(oldName, newName);+ public Collection<String> getUndefinedFields() {+ Collection<String> undefinedFields = new HashSet<>();+ for (TransitionSpec transition: getTransitionSpecs())+ undefinedFields.addAll(transition.getUndefinedFields());+ for (FieldSpec field: getFieldSpecs())+ undefinedFields.addAll(field.getUndefinedFields());+ for (BoardSpec board: getBoardSpecs())+ undefinedFields.addAll(board.getUndefinedFields(null));for (NamedIssueQuery namedQuery: getNamedQueries()) {try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);- query.onRenameState(oldName, newName);- namedQuery.setQuery(query.toString());+ undefinedFields.addAll(query.getUndefinedFields());} catch (Exception e) {}}+ return undefinedFields;}- @Nullable- public StateSpec getStateSpec(String stateName) {- return getStateSpecMap().get(stateName);- }-- @Nullable- public FieldSpec getFieldSpec(String fieldName) {- return getFieldSpecMap(null).get(fieldName);+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();+ for (TransitionSpec transition: getTransitionSpecs())+ undefinedFieldValues.addAll(transition.getUndefinedFieldValues());+ for (FieldSpec field: getFieldSpecs())+ undefinedFieldValues.addAll(field.getUndefinedFieldValues());+ for (BoardSpec board: getBoardSpecs())+ undefinedFieldValues.addAll(board.getUndefinedFieldValues(null));+ for (NamedIssueQuery namedQuery: getNamedQueries()) {+ try {+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);+ undefinedFieldValues.addAll(query.getUndefinedFieldValues());+ } catch (Exception e) {+ }+ }+ return undefinedFieldValues;}-- public void onEditFieldValues(@Nullable Project project, String fieldName, ValueSetEdit valueSetEdit) {- for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {- TransitionSpec transition = it.next();- if (transition.onEditFieldValues(fieldName, valueSetEdit))++ public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {+ if (it.next().fixUndefinedStates(resolutions))it.remove();}- for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {- if (it.next().onEditFieldValues(project, fieldName, valueSetEdit))+ for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {+ if (it.next().fixUndefinedStates(null, resolutions))it.remove();}-for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);- if (query.onEditFieldValues(fieldName, valueSetEdit))+ if (query.fixUndefinedStates(resolutions))it.remove();elsenamedQuery.setQuery(query.toString());} catch (Exception e) {}}- Set<String> deletedFields = new HashSet<>();- for (Iterator<FieldSpec> it = getFieldSpecs().iterator(); it.hasNext();) {- FieldSpec field = it.next();- if (field.onEditInputValues(fieldName, valueSetEdit)) {+ }++ public Collection<String> fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {+ for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {+ if (it.next().fixUndefinedFields(resolutions))it.remove();- deletedFields.add(field.getName());- }}- for (String deletedField: deletedFields) {- onDeleteField(deletedField);- OneDev.getInstance(RoleManager.class).onDeleteIssueField(deletedField);+ for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {+ if (it.next().fixUndefinedFields(null, resolutions))+ it.remove();}- }-- public void onRenameField(String oldName, String newName) {- for (TransitionSpec transition: getDefaultTransitionSpecs())- transition.onRenameField(oldName, newName);- for (FieldSpec field: getFieldSpecs())- field.onRenameInput(oldName, newName);- for (BoardSpec board: getDefaultBoardSpecs())- board.onRenameField(oldName, newName);- for (NamedIssueQuery namedQuery: getNamedQueries()) {+ for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);- query.onRenameField(oldName, newName);- namedQuery.setQuery(query.toString());+ if (query.fixUndefinedFields(resolutions))+ it.remove();+ else+ namedQuery.setQuery(query.toString());} catch (Exception e) {}}++ Collection<String> derivedDeletions = new HashSet<>();+ for (Iterator<FieldSpec> it = getFieldSpecs().iterator(); it.hasNext();) {+ FieldSpec field = it.next();+ if (field.fixUndefinedFields(resolutions)) {+ it.remove();+ derivedDeletions.add(field.getName());+ }+ }++ return derivedDeletions;}- public void onDeleteField(String fieldName) {- for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {- if (it.next().onDeleteField(fieldName))+ public Collection<String> fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {+ for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {+ if (it.next().fixUndefinedFieldValues(resolutions))it.remove();}-- for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {- if (it.next().onDeleteField(fieldName))+ for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {+ if (it.next().fixUndefinedFieldValues(null, resolutions))it.remove();}-for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);- if (query.onDeleteField(fieldName))+ if (query.fixUndefinedFieldValues(resolutions))it.remove();elsenamedQuery.setQuery(query.toString());@@ -485,20 +499,28 @@ public class GlobalIssueSetting implements Serializable {}}- for (FieldSpec field: getFieldSpecs())- field.onDeleteInput(fieldName);+ Collection<String> derivedDeletions = new HashSet<>();+ for (Iterator<FieldSpec> it = getFieldSpecs().iterator(); it.hasNext();) {+ FieldSpec field = it.next();+ if (field.fixUndefinedFieldValues(resolutions)) {+ it.remove();+ derivedDeletions.add(field.getName());+ }+ }++ return derivedDeletions;}public void onRenameUser(String oldName, String newName) {for (FieldSpec field: getFieldSpecs())field.onRenameUser(oldName, newName);- for (BoardSpec board: getDefaultBoardSpecs())+ for (BoardSpec board: getBoardSpecs())board.onRenameUser(this, oldName, newName);}public Usage onDeleteUser(String userName) {Usage usage = new Usage();- for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {+ for (Iterator<BoardSpec> it = getBoardSpecs().iterator(); it.hasNext();) {if (it.next().onDeleteUser(this, userName))it.remove();}@@ -523,14 +545,14 @@ public class GlobalIssueSetting implements Serializable {}public void onRenameRole(String oldName, String newName) {- for (TransitionSpec transition: getDefaultTransitionSpecs())+ for (TransitionSpec transition: getTransitionSpecs())transition.onRenameRole(oldName, newName);}public Usage onDeleteRole(String roleName) {Usage usage = new Usage();- for (TransitionSpec transition: getDefaultTransitionSpecs())+ for (TransitionSpec transition: getTransitionSpecs())usage.add(transition.onDeleteRole(roleName));return usage.prefix("issue setting");@@ -543,12 +565,12 @@ public class GlobalIssueSetting implements Serializable {throw new OneException("No any issue state is defined");}- public List<BoardSpec> getDefaultBoardSpecs() {- return defaultBoardSpecs;+ public List<BoardSpec> getBoardSpecs() {+ return boardSpecs;}- public void setDefaultBoardSpecs(List<BoardSpec> defaultBoardSpecs) {- this.defaultBoardSpecs = defaultBoardSpecs;+ public void setBoardSpecs(List<BoardSpec> boardSpecs) {+ this.boardSpecs = boardSpecs;}public List<String> getListFields() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.javaindex 2936d10262..4c04415848 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalProjectSetting.java@@ -16,7 +16,6 @@ public class GlobalProjectSetting implements Serializable {public GlobalProjectSetting() {namedQueries.add(new NamedProjectQuery("All", null));- namedQueries.add(new NamedProjectQuery("Mine", "owned by me"));}public List<NamedProjectQuery> getNamedQueries() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.javaindex 3d0863e119..31ba075b82 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalPullRequestSetting.java@@ -24,6 +24,7 @@ public class GlobalPullRequestSetting implements Serializable {namedQueries.add(new NamedPullRequestQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));namedQueries.add(new NamedPullRequestQuery("Updated recently", "\"Update Date\" is after \"last week\""));namedQueries.add(new NamedPullRequestQuery("Closed", "merged or discarded"));+ namedQueries.add(new NamedPullRequestQuery("All", null));}public List<NamedPullRequestQuery> getNamedQueries() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.javaindex 048a8444f3..2e8ee9a991 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java@@ -50,7 +50,7 @@ public class JobSecret implements Serializable {Project project = Project.get();List<InputCompletion> suggestions = new ArrayList<>();if (project != null) {- for (JobSecret secret: project.getBuildSetting().getInheritedSecrets(project)) {+ for (JobSecret secret: project.getBuildSetting().getJobSecrets()) {LinearRange match = LinearRange.match(secret.getName(), inputStatus.getContentBeforeCaret());if (match != null) {InputCompletion suggestion = new InputCompletion(secret.getName(),diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.javaindex 1b7a924821..bc350e584f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java@@ -2,10 +2,7 @@ package io.onedev.server.model.support.build;import java.io.Serializable;import java.util.ArrayList;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;-import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -101,22 +98,8 @@ public class ProjectBuildSetting implements Serializable {return null;}- public List<JobSecret> getInheritedSecrets(Project project) {- Map<String, JobSecret> inheritedSecrets = new LinkedHashMap<>();- for (JobSecret secret: project.getOwner().getBuildSetting().getJobSecrets())- inheritedSecrets.put(secret.getName(), secret);- inheritedSecrets.keySet().removeAll(jobSecrets.stream().map(it->it.getName()).collect(Collectors.toSet()));- return new ArrayList<>(inheritedSecrets.values());- }-- public List<JobSecret> getHierarchySecrets(Project project) {- List<JobSecret> hierarchySecrets = new ArrayList<>(getJobSecrets());- hierarchySecrets.addAll(getInheritedSecrets(project));- return hierarchySecrets;- }-public String getSecretValue(Project project, String secretName, ObjectId commitId) {- for (JobSecret secret: getHierarchySecrets(project)) {+ for (JobSecret secret: getJobSecrets()) {if (secret.getName().equals(secretName)) {if (secret.isAuthorized(project, commitId))return secret.getValue();@@ -127,20 +110,8 @@ public class ProjectBuildSetting implements Serializable {throw new OneException("No job secret found: " + secretName);}- public List<BuildPreservation> getHierarchyBuildPreservations(Project project) {- List<BuildPreservation> hierarchyBuildPreservations = new ArrayList<>(getBuildPreservations());- hierarchyBuildPreservations.addAll(project.getOwner().getBuildSetting().getBuildPreservations());- return hierarchyBuildPreservations;- }-- public List<ActionAuthorization> getHierarchyActionAuthorizations(Project project) {- List<ActionAuthorization> hierarchyBranchAuthorizations = new ArrayList<>(getActionAuthorizations());- hierarchyBranchAuthorizations.addAll(project.getOwner().getBuildSetting().getActionAuthorizations());- return hierarchyBranchAuthorizations;- }-public boolean isActionAuthorized(Build build, PostBuildAction action) {- List<ActionAuthorization> authorizations = getHierarchyActionAuthorizations(build.getProject());+ List<ActionAuthorization> authorizations = getActionAuthorizations();if (!authorizations.isEmpty()) {for (ActionAuthorization authorization: authorizations) {if (authorization.isAuthorized(build, action))diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/UserBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/UserBuildSetting.javadeleted file mode 100644index b105bca0b4..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/build/UserBuildSetting.java+++ /dev/null@@ -1,45 +0,0 @@-package io.onedev.server.model.support.build;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;--import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class UserBuildSetting implements Serializable {-- private static final long serialVersionUID = 1L;-- private List<JobSecret> jobSecrets = new ArrayList<>();-- private List<BuildPreservation> buildPreservations = new ArrayList<>();-- private List<ActionAuthorization> actionAuthorizations = new ArrayList<>();-- public List<JobSecret> getJobSecrets() {- return jobSecrets;- }-- public void setJobSecrets(List<JobSecret> jobSecrets) {- this.jobSecrets = jobSecrets;- }-- public List<BuildPreservation> getBuildPreservations() {- return buildPreservations;- }-- public void setBuildPreservations(List<BuildPreservation> buildPreservations) {- this.buildPreservations = buildPreservations;- }-- public List<ActionAuthorization> getActionAuthorizations() {- return actionAuthorizations;- }-- public void setActionAuthorizations(List<ActionAuthorization> actionAuthorizations) {- this.actionAuthorizations = actionAuthorizations;- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.javaindex 77489bb75d..77f6ee7827 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java@@ -14,25 +14,20 @@ import javax.annotation.Nullable;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.issue.BoardSpec;-import io.onedev.server.issue.TransitionSpec;import io.onedev.server.model.Project;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.Usage;-import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.web.component.issue.workflowreconcile.ReconcileUtils;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;-import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution.FixType;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;public class ProjectIssueSetting implements Serializable {private static final long serialVersionUID = 1L;- private List<TransitionSpec> transitionSpecs;-- private Collection<String> promptFieldsUponIssueOpen;-private List<String> listFields;private List<BoardSpec> boardSpecs;@@ -47,30 +42,6 @@ public class ProjectIssueSetting implements Serializable {return setting;}- @Nullable- public List<TransitionSpec> getTransitionSpecs(boolean useDefaultIfNotDefined) {- if (useDefaultIfNotDefined && transitionSpecs == null)- return new ArrayList<>(getGlobalSetting().getDefaultTransitionSpecs());- else- return transitionSpecs;- }-- public void setTransitionSpecs(List<TransitionSpec> stateTransitions) {- this.transitionSpecs = stateTransitions;- }-- @Nullable- public Collection<String> getPromptFieldsUponIssueOpen(boolean useDefaultIfNotDefined) {- if (useDefaultIfNotDefined && promptFieldsUponIssueOpen == null)- return new HashSet<>(getGlobalSetting().getDefaultPromptFieldsUponIssueOpen());- else- return promptFieldsUponIssueOpen;- }-- public void setPromptFieldsUponIssueOpen(@Nullable Collection<String> promptFieldsUponIssueOpen) {- this.promptFieldsUponIssueOpen = promptFieldsUponIssueOpen;- }-@Nullablepublic List<String> getListFields(boolean useDefaultIfNotDefined) {if (useDefaultIfNotDefined && listFields == null)@@ -86,7 +57,7 @@ public class ProjectIssueSetting implements Serializable {@Nullablepublic List<BoardSpec> getBoardSpecs(boolean useDefaultIfNotDefined) {if (useDefaultIfNotDefined && boardSpecs == null)- return new ArrayList<>(getGlobalSetting().getDefaultBoardSpecs());+ return new ArrayList<>(getGlobalSetting().getBoardSpecs());elsereturn boardSpecs;}@@ -123,18 +94,6 @@ public class ProjectIssueSetting implements Serializable {}}- public Usage onDeleteBranch(String branchName) {- Usage usage = new Usage();- if (transitionSpecs != null) {- int index = 1;- for (TransitionSpec transitionSpec: transitionSpecs) {- usage.add(transitionSpec.onDeleteBranch(branchName)).prefix("transition #" + index);- index++;- }- }- return usage.prefix("issue setting");- }-public Usage onDeleteUser(String userName) {Usage usage = new Usage();if (boardSpecs != null) {@@ -146,23 +105,24 @@ public class ProjectIssueSetting implements Serializable {return usage.prefix("issue setting");}- public void onRenameRole(String oldName, String newName) {- if (transitionSpecs != null) {- for (TransitionSpec transition: transitionSpecs)- transition.onRenameRole(oldName, newName);- }- }+ public Collection<String> getUndefinedStates(Project project) {+ Set<String> undefinedStates = new HashSet<>();- public Usage onDeleteRole(String roleName) {- Usage usage = new Usage();- if (transitionSpecs != null) {- int index = 1;- for (TransitionSpec transition: transitionSpecs) {- usage.add(transition.onDeleteRole(roleName).prefix("transition #" + index));- index ++;+ if (namedQueries != null) {+ for (NamedIssueQuery namedQuery: namedQueries) {+ try {+ undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedStates());+ } catch (Exception e) {+ }}}- return usage.prefix("issue setting");++ if (boardSpecs != null) {+ for (BoardSpec board: boardSpecs)+ undefinedStates.addAll(board.getUndefinedStates(project));+ }++ return undefinedStates;}public Collection<String> getUndefinedFields(Project project) {@@ -173,16 +133,6 @@ public class ProjectIssueSetting implements Serializable {undefinedFields.add(fieldName);}}- if (promptFieldsUponIssueOpen != null) {- for (String fieldName: promptFieldsUponIssueOpen) {- if (getGlobalSetting().getFieldSpec(fieldName) == null)- undefinedFields.add(fieldName);- }- }- if (transitionSpecs != null) {- for (TransitionSpec transition: transitionSpecs)- undefinedFields.addAll(transition.getUndefinedFields(project));- }if (namedQueries != null) {for (NamedIssueQuery namedQuery: namedQueries) {try {@@ -198,91 +148,33 @@ public class ProjectIssueSetting implements Serializable {return undefinedFields;}- public void fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {- if (listFields != null) {- listFields.remove(entry.getKey());- if (entry.getValue().getFixType() == FixType.CHANGE_TO_ANOTHER_FIELD)- listFields.add(entry.getValue().getNewField());- }- if (promptFieldsUponIssueOpen != null) {- promptFieldsUponIssueOpen.remove(entry.getKey());- if (entry.getValue().getFixType() == FixType.CHANGE_TO_ANOTHER_FIELD)- promptFieldsUponIssueOpen.add(entry.getValue().getNewField());- }- }- if (namedQueries != null) {- for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {- NamedIssueQuery namedQuery = it.next();- try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true);- boolean remove = false;- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {- UndefinedFieldResolution resolution = entry.getValue();- if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {- query.onRenameField(entry.getKey(), resolution.getNewField());- } else if (query.onDeleteField(entry.getKey())) {- remove = true;- break;- }- }- if (remove)- it.remove();- else- namedQuery.setQuery(query.toString());- } catch (Exception e) {- }- }- }-- if (transitionSpecs != null) {- for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {- if (it.next().fixUndefinedFields(resolutions))- it.remove();- }- }-- if (boardSpecs != null) {- for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {- if (it.next().fixUndefinedFields(resolutions))- it.remove();- }- }- }-- public Collection<String> getUndefinedStates(Project project) {- Set<String> undefinedStates = new HashSet<>();-+ public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();if (namedQueries != null) {for (NamedIssueQuery namedQuery: namedQueries) {try {- undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true).getUndefinedStates());+ undefinedFieldValues.addAll(IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFieldValues());} catch (Exception e) {}}}-if (boardSpecs != null) {for (BoardSpec board: boardSpecs)- undefinedStates.addAll(board.getUndefinedStates(project));- }-- if (transitionSpecs != null) {- for (TransitionSpec transition: transitionSpecs)- undefinedStates.addAll(transition.getUndefinedStates());+ undefinedFieldValues.addAll(board.getUndefinedFieldValues(project));}-- return undefinedStates;+ return undefinedFieldValues;}-+public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {if (namedQueries != null) {- for (NamedIssueQuery namedQuery: namedQueries) {+ for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();try {- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);- for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())- query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());- namedQuery.setQuery(query.toString());+ IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);+ if (parsedQuery.fixUndefinedStates(resolutions))+ it.remove();+ else+ namedQuery.setQuery(parsedQuery.toString());} catch (Exception e) {}}@@ -292,66 +184,56 @@ public class ProjectIssueSetting implements Serializable {for (BoardSpec board: boardSpecs)board.fixUndefinedStates(project, resolutions);}-- if (transitionSpecs != null) {- for (TransitionSpec transition: transitionSpecs)- transition.fixUndefinedStates(resolutions);- }}- public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {- Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();+ public void fixUndefinedFields(Project project, Map<String, UndefinedFieldResolution> resolutions) {+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {+ if (listFields != null) {+ if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD)+ ReconcileUtils.renameItem(listFields, entry.getKey(), entry.getValue().getNewField());+ else+ listFields.remove(entry.getKey());+ }+ }if (namedQueries != null) {- for (NamedIssueQuery namedQuery: namedQueries) {+ for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();try {- undefinedFieldValues.addAll(IssueQuery.parse(null, namedQuery.getQuery(), false, true, true, true, true).getUndefinedFieldValues());+ IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);+ if (parsedQuery.fixUndefinedFields(resolutions))+ it.remove();+ else+ namedQuery.setQuery(parsedQuery.toString());} catch (Exception e) {}}}+if (boardSpecs != null) {- for (BoardSpec board: boardSpecs)- undefinedFieldValues.addAll(board.getUndefinedFieldValues(project));- }- if (transitionSpecs != null) {- for (TransitionSpec transition: transitionSpecs)- undefinedFieldValues.addAll(transition.getUndefinedFieldValues());+ for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {+ if (it.next().fixUndefinedFields(project, resolutions))+ it.remove();+ }}- return undefinedFieldValues;- }+ }- public void fixUndefinedFieldValues(Project project, Map<String, ValueSetEdit> valueSetEdits) {+ public void fixUndefinedFieldValues(Project project, Map<String, UndefinedFieldValuesResolution> resolutions) {if (namedQueries != null) {for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {- boolean remove = false;- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);- for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {- if (query.onEditFieldValues(entry.getKey(), entry.getValue())) {- remove = true;- break;- }- }- if (remove)+ IssueQuery parsedQuery = IssueQuery.parse(project, namedQuery.getQuery(), false, true, true, true, true);+ if (parsedQuery.fixUndefinedFieldValues(resolutions))it.remove();else- namedQuery.setQuery(query.toString());+ namedQuery.setQuery(parsedQuery.toString());} catch (Exception e) {}}}if (boardSpecs != null) {for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {- if (it.next().fixUndefinedFieldValues(project, valueSetEdits)) {- it.remove();- break;- }- }- }- if (transitionSpecs != null) {- for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {- if (it.next().fixUndefinedFieldValues(valueSetEdits)) {+ if (it.next().fixUndefinedFieldValues(project, resolutions)) {it.remove();break;}diff --git a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.javaindex 9bdd5d4bdb..b12e314411 100644--- a/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/WebHookManager.java@@ -56,7 +56,7 @@ public class WebHookManager {} catch (JsonProcessingException e) {throw new RuntimeException(e);}- for (WebHook webHook: event.getProject().getHierarchyWebHooks()) {+ for (WebHook webHook: event.getProject().getWebHooks()) {for (WebHook.EventType eventType: webHook.getEventTypes()) {if (eventType.includes(event)) {executor.submit(new Runnable() {diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultIdManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultIdManager.javaindex a2c262f0c1..660428bef9 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultIdManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultIdManager.java@@ -48,15 +48,23 @@ public class DefaultIdManager implements IdManager {}}- @Sessional@Override- public void init(Class<?> entityClass) {- nextIds.get(entityClass).set(getMaxId(entityClass)+1);+ public long nextId(Class<?> entityClass) {+ return nextIds.get(entityClass).getAndIncrement();}@Override- public long nextId(Class<?> entityClass) {- return nextIds.get(entityClass).getAndIncrement();+ public void useId(Class<?> entityClass, long id) {+ AtomicLong nextIdAtom = nextIds.get(entityClass);+ while (true) {+ long nextId = nextIdAtom.get();+ if (id+1 > nextId) {+ if (nextIdAtom.compareAndSet(nextId, id+1))+ break;+ } else {+ break;+ }+ }}}diff --git a/server-core/src/main/java/io/onedev/server/persistence/IdManager.java b/server-core/src/main/java/io/onedev/server/persistence/IdManager.javaindex c3ffb1839b..18498ef7c8 100644--- a/server-core/src/main/java/io/onedev/server/persistence/IdManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/IdManager.java@@ -4,8 +4,8 @@ public interface IdManager {void init();- void init(Class<?> entityClass);-long nextId(Class<?> entityClass);+ void useId(Class<?> entityClass, long id);+}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.javaindex 4532b633a6..3dba71e606 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndIssueCriteria.java@@ -5,6 +5,7 @@ import java.util.Collection;import java.util.HashSet;import java.util.Iterator;import java.util.List;+import java.util.Map;import java.util.Set;import javax.persistence.criteria.CriteriaBuilder;@@ -13,8 +14,10 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.search.entity.AndEntityCriteria;-import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;public class AndIssueCriteria extends IssueCriteria {@@ -49,21 +52,6 @@ public class AndIssueCriteria extends IssueCriteria {return undefinedStates;}- @Override- public void onRenameState(String oldName, String newName) {- for (IssueCriteria criteria: criterias)- criteria.onRenameState(oldName, newName);- }-- @Override- public boolean onDeleteState(String stateName) {- for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {- if (it.next().onDeleteState(stateName))- it.remove();- }- return criterias.isEmpty();- }-@Overridepublic Collection<String> getUndefinedFields() {Set<String> undefinedFields = new HashSet<>();@@ -73,37 +61,40 @@ public class AndIssueCriteria extends IssueCriteria {}@Override- public void onRenameField(String oldName, String newName) {+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();for (IssueCriteria criteria: criterias)- criteria.onRenameField(oldName, newName);+ undefinedFieldValues.addAll(criteria.getUndefinedFieldValues());+ return undefinedFieldValues;}@Override- public boolean onDeleteField(String fieldName) {+ public boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {- if (it.next().onDeleteField(fieldName))+ if (it.next().fixUndefinedStates(resolutions))it.remove();}return criterias.isEmpty();}-+@Override- public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {+ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {- if (it.next().onEditFieldValues(fieldName, valueSetEdit))+ if (it.next().fixUndefinedFields(resolutions))it.remove();}return criterias.isEmpty();}-+@Override- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {- Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();- for (IssueCriteria criteria: criterias)- undefinedFieldValues.addAll(criteria.getUndefinedFieldValues());- return undefinedFieldValues;+ public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {+ for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {+ if (it.next().fixUndefinedFieldValues(resolutions))+ it.remove();+ }+ return criterias.isEmpty();}-+@Overridepublic void fill(Issue issue) {for (IssueCriteria criteria: criterias)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.javaindex ba11296797..043076a30b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java@@ -4,6 +4,7 @@ import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;import java.util.List;+import java.util.Map;import java.util.Objects;import javax.persistence.criteria.CriteriaBuilder;@@ -15,9 +16,9 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;public class ChoiceFieldCriteria extends FieldCriteria {@@ -83,13 +84,15 @@ public class ChoiceFieldCriteria extends FieldCriteria {}@Override- public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {- if (fieldName.equals(getFieldName())) {- if (valueSetEdit.getDeletions().contains(value))- return true;- String newValue = valueSetEdit.getRenames().get(value);- if (newValue != null)- value = newValue;+ public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {+ for (Map.Entry<String, UndefinedFieldValuesResolution> entry: resolutions.entrySet()) {+ if (entry.getKey().equals(getFieldName())) {+ if (entry.getValue().getDeletions().contains(value))+ return true;+ String newValue = entry.getValue().getRenames().get(value);+ if (newValue != null)+ value = newValue;+ }}return false;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.javaindex ca09026705..bc50d56c5c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.issue;import java.util.Collection;import java.util.HashSet;+import java.util.Map;import java.util.Set;import javax.annotation.Nullable;@@ -19,6 +20,7 @@ import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;public abstract class FieldCriteria extends IssueCriteria {@@ -70,20 +72,22 @@ public abstract class FieldCriteria extends IssueCriteria {return undefinedFields;}- public FieldSpec getFieldSpec() {- SettingManager settingManager = OneDev.getInstance(SettingManager.class);- return Preconditions.checkNotNull(settingManager.getIssueSetting().getFieldSpec(fieldName));- }-@Override- public void onRenameField(String oldField, String newField) {- if (oldField.equals(fieldName))- fieldName = newField;+ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {+ if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {+ if (entry.getKey().equals(fieldName))+ fieldName = entry.getValue().getNewField();+ } else if (entry.getKey().equals(fieldName)) {+ return true;+ }+ }+ return false;}- @Override- public boolean onDeleteField(String fieldName) {- return fieldName.equals(this.fieldName);+ public FieldSpec getFieldSpec() {+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);+ return Preconditions.checkNotNull(settingManager.getIssueSetting().getFieldSpec(fieldName));}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.javaindex cca3d98fec..7c9b1ed6da 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java@@ -3,13 +3,16 @@ package io.onedev.server.search.entity.issue;import java.util.Collection;import java.util.HashSet;import java.util.List;+import java.util.Map;import javax.annotation.Nullable;import io.onedev.server.model.Issue;import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;public abstract class IssueCriteria extends EntityCriteria<Issue> {@@ -22,28 +25,26 @@ public abstract class IssueCriteria extends EntityCriteria<Issue> {return new HashSet<>();}- public void onRenameState(String oldState, String newState) {- }-public Collection<String> getUndefinedFields() {return new HashSet<>();}- public void onRenameField(String oldField, String newField) {+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ return new HashSet<>();}-- public boolean onDeleteField(String fieldName) {++ public boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {return false;}- public boolean onDeleteState(String stateName) {+ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {return false;}- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {- return new HashSet<>();+ public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {+ return false;}-+@Nullablepublic static IssueCriteria and(List<IssueCriteria> criterias) {if (criterias.size() > 1)@@ -64,8 +65,4 @@ public abstract class IssueCriteria extends EntityCriteria<Issue> {return null;}- public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {- return false;- }-}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 235cb41952..c8c96e417f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -3,7 +3,6 @@ package io.onedev.server.search.entity.issue;import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;-import java.util.Iterator;import java.util.List;import java.util.Map;import java.util.Set;@@ -53,8 +52,10 @@ import io.onedev.server.search.entity.issue.IssueQueryParser.OrderContext;import io.onedev.server.search.entity.issue.IssueQueryParser.ParensCriteriaContext;import io.onedev.server.search.entity.issue.IssueQueryParser.QueryContext;import io.onedev.server.search.entity.issue.IssueQueryParser.RevisionCriteriaContext;-import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;import io.onedev.server.web.util.WicketUtils;@@ -156,7 +157,10 @@ public class IssueQuery extends EntityQuery<Issue> {return new MilestoneIsEmptyCriteria();} else {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);- return new FieldOperatorCriteria(fieldName, operator, fieldSpec.isAllowMultiple());+ if (fieldSpec != null)+ return new FieldOperatorCriteria(fieldName, operator, fieldSpec.isAllowMultiple());+ else+ return new FieldOperatorCriteria(fieldName, operator, false);}}@@ -313,7 +317,7 @@ public class IssueQuery extends EntityQuery<Issue> {String fieldName = getValue(order.Quoted().getText());if (validate && !Issue.ORDER_FIELDS.containsKey(fieldName)) {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);- if (!(fieldSpec instanceof ChoiceField) && !(fieldSpec instanceof DateField)+ if (validate && !(fieldSpec instanceof ChoiceField) && !(fieldSpec instanceof DateField)&& !(fieldSpec instanceof NumberField)) {throw new OneException("Can not order by field: " + fieldName);}@@ -440,19 +444,11 @@ public class IssueQuery extends EntityQuery<Issue> {return new ArrayList<>();}- public void onRenameState(String oldName, String newName) {- if (criteria != null)- criteria.onRenameState(oldName, newName);- }-- public boolean onDeleteState(String stateName) {- return criteria != null && criteria.onDeleteState(stateName);- }-public Collection<String> getUndefinedFields() {Set<String> undefinedFields = new HashSet<>();- if (criteria != null)+ if (criteria != null) {undefinedFields.addAll(criteria.getUndefinedFields());+ }for (EntitySort sort: sorts) {if (!Issue.QUERY_FIELDS.contains(sort.getField())&& getGlobalIssueSetting().getFieldSpec(sort.getField()) == null) {@@ -462,25 +458,6 @@ public class IssueQuery extends EntityQuery<Issue> {return undefinedFields;}- public void onRenameField(String oldName, String newName) {- if (criteria != null)- criteria.onRenameField(oldName, newName);- for (EntitySort sort: sorts) {- if (sort.getField().equals(oldName))- sort.setField(newName);- }- }-- public boolean onDeleteField(String fieldName) {- if (criteria != null && criteria.onDeleteField(fieldName))- return true;- for (Iterator<EntitySort> it = sorts.iterator(); it.hasNext();) {- if (it.next().getField().equals(fieldName))- it.remove();- }- return false;- }-public Collection<UndefinedFieldValue> getUndefinedFieldValues() {if (criteria != null)return criteria.getUndefinedFieldValues();@@ -488,16 +465,25 @@ public class IssueQuery extends EntityQuery<Issue> {return new HashSet<>();}- public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {- return criteria != null && criteria.onEditFieldValues(fieldName, valueSetEdit);+ public boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ if (criteria != null)+ return criteria.fixUndefinedStates(resolutions);+ else+ return false;}- public boolean fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {- for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {- if (onEditFieldValues(entry.getKey(), entry.getValue()))- return true;- }- return false;+ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {+ if (criteria != null)+ return criteria.fixUndefinedFields(resolutions);+ else+ return false;+ }++ public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {+ if (criteria != null)+ return criteria.fixUndefinedFieldValues(resolutions);+ else+ return false;}public static IssueQuery merge(IssueQuery query1, IssueQuery query2) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.javaindex 9f3bd19bfc..129a68d442 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NotIssueCriteria.java@@ -1,16 +1,18 @@package io.onedev.server.search.entity.issue;import java.util.Collection;+import java.util.Map;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;-import io.onedev.server.search.entity.NotEntityCriteria;-import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;public class NotIssueCriteria extends IssueCriteria {@@ -37,26 +39,6 @@ public class NotIssueCriteria extends IssueCriteria {return new NotEntityCriteria<Issue>(criteria).asString();}- @Override- public void onRenameField(String oldName, String newName) {- criteria.onRenameField(oldName, newName);- }-- @Override- public boolean onDeleteField(String fieldName) {- return criteria.onDeleteField(fieldName);- }-- @Override- public void onRenameState(String oldName, String newName) {- criteria.onRenameState(oldName, newName);- }-- @Override- public boolean onDeleteState(String stateName) {- return criteria.onDeleteState(stateName);- }-@Overridepublic Collection<String> getUndefinedStates() {return criteria.getUndefinedStates();@@ -73,8 +55,18 @@ public class NotIssueCriteria extends IssueCriteria {}@Override- public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {- return criteria.onEditFieldValues(fieldName, valueSetEdit);+ public boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ return criteria.fixUndefinedStates(resolutions);+ }++ @Override+ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {+ return criteria.fixUndefinedFields(resolutions);+ }++ @Override+ public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {+ return criteria.fixUndefinedFieldValues(resolutions);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.javaindex 1e0a6befc1..5ac091205b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrIssueCriteria.java@@ -5,6 +5,7 @@ import java.util.Collection;import java.util.HashSet;import java.util.Iterator;import java.util.List;+import java.util.Map;import java.util.Set;import javax.persistence.criteria.CriteriaBuilder;@@ -13,8 +14,10 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.search.entity.OrEntityCriteria;-import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;public class OrIssueCriteria extends IssueCriteria {@@ -49,21 +52,6 @@ public class OrIssueCriteria extends IssueCriteria {return undefinedStates;}- @Override- public void onRenameState(String oldName, String newName) {- for (IssueCriteria criteria: criterias)- criteria.onRenameState(oldName, newName);- }-- @Override- public boolean onDeleteState(String stateName) {- for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {- if (it.next().onDeleteState(stateName))- it.remove();- }- return criterias.isEmpty();- }-@Overridepublic Collection<String> getUndefinedFields() {Set<String> undefinedFields = new HashSet<>();@@ -73,34 +61,38 @@ public class OrIssueCriteria extends IssueCriteria {}@Override- public void onRenameField(String oldName, String newName) {+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();for (IssueCriteria criteria: criterias)- criteria.onRenameField(oldName, newName);+ undefinedFieldValues.addAll(criteria.getUndefinedFieldValues());+ return undefinedFieldValues;}@Override- public boolean onDeleteField(String fieldName) {+ public boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {- if (it.next().onDeleteField(fieldName))+ if (it.next().fixUndefinedStates(resolutions))it.remove();}return criterias.isEmpty();}@Override- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {- Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();- for (IssueCriteria criteria: criterias)- undefinedFieldValues.addAll(criteria.getUndefinedFieldValues());- return undefinedFieldValues;+ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {+ for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {+ if (it.next().fixUndefinedFields(resolutions))+ it.remove();+ }+ return criterias.isEmpty();}@Override- public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {+ public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {- if (it.next().onEditFieldValues(fieldName, valueSetEdit))+ if (it.next().fixUndefinedFieldValues(resolutions))it.remove();}return criterias.isEmpty();}+}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.javaindex 62e70fca42..20d926de4b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java@@ -3,6 +3,7 @@ package io.onedev.server.search.entity.issue;import java.util.ArrayList;import java.util.Collection;import java.util.List;+import java.util.Map;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Path;@@ -12,6 +13,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;public class StateCriteria extends IssueCriteria {@@ -55,14 +57,16 @@ public class StateCriteria extends IssueCriteria {}@Override- public void onRenameState(String oldName, String newName) {- if (value.equals(oldName))- value = newName;- }-- @Override- public boolean onDeleteState(String stateName) {- return value.equals(stateName);+ public boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {+ if (entry.getValue().getFixType() == UndefinedStateResolution.FixType.CHANGE_TO_ANOTHER_STATE) {+ if (entry.getKey().equals(value))+ value = entry.getValue().getNewState();+ } else if (entry.getKey().equals(value)) {+ return true;+ }+ }+ return false;}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.javadeleted file mode 100644index 2c324d9195..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java+++ /dev/null@@ -1,43 +0,0 @@-package io.onedev.server.search.entity.project;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Expression;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.search.entity.EntityCriteria;-import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.util.criteria.Criteria;--public class OwnedByCriteria extends EntityCriteria<Project> {-- private static final long serialVersionUID = 1L;-- private final User user;-- private final String value;-- public OwnedByCriteria(String value) {- user = EntityQuery.getUser(value);- this.value = value;- }-- @Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {- Expression<String> attribute = root.get(Project.PROP_OWNER);- return builder.equal(attribute, this.user);- }-- @Override- public boolean matches(Project project) {- return project.getOwner().equals(this.user);- }-- @Override- public String asString() {- return ProjectQuery.getRuleName(ProjectQueryLexer.OwnedBy) + " " + Criteria.quote(value);- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.javadeleted file mode 100644index a9cc58fc17..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java+++ /dev/null@@ -1,39 +0,0 @@-package io.onedev.server.search.entity.project;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Expression;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.OneException;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.search.entity.EntityCriteria;--public class OwnedByMeCriteria extends EntityCriteria<Project> {-- private static final long serialVersionUID = 1L;-- @Override- public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder) {- Expression<String> attribute = root.get(Project.PROP_OWNER);- if (User.get() != null)- return builder.equal(attribute, User.get());- else- throw new OneException("Please login to perform this query");- }-- @Override- public boolean matches(Project project) {- if (User.get() != null)- return User.get().equals(project.getOwner());- else- throw new OneException("Please login to perform this query");- }-- @Override- public String asString() {- return ProjectQuery.getRuleName(ProjectQueryLexer.OwnedByMe);- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4index 01c5f3ed9a..a61f520b30 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4@@ -7,8 +7,7 @@ query;criteria- : operator=OwnedByMe #OperatorCriteria- | operator=(OwnedBy|ForksOf) WS+ criteriaValue=Quoted #OperatorValueCriteria+ : operator=ForksOf WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|Contains|IsBefore|IsAfter) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -28,14 +27,6 @@ Is: 'is';-OwnedBy- : 'owned' WS+ 'by'- ;--OwnedByMe- : 'owned' WS+ 'by' WS+ 'me'- ;-IsAfter: 'is' WS+ 'after';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.javaindex 52cc268a87..214830d61e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java@@ -27,7 +27,6 @@ import io.onedev.server.search.entity.project.ProjectQueryParser.AndCriteriaContimport io.onedev.server.search.entity.project.ProjectQueryParser.CriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.FieldOperatorValueCriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.NotCriteriaContext;-import io.onedev.server.search.entity.project.ProjectQueryParser.OperatorCriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.OperatorValueCriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.OrCriteriaContext;import io.onedev.server.search.entity.project.ProjectQueryParser.OrderContext;@@ -89,16 +88,9 @@ public class ProjectQuery extends EntityQuery<Project> {projectCriteria = new ProjectQueryBaseVisitor<EntityCriteria<Project>>() {@Override- public EntityCriteria<Project> visitOperatorCriteria(OperatorCriteriaContext ctx) {- return new OwnedByMeCriteria();- }-public EntityCriteria<Project> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {String value = getValue(ctx.Quoted().getText());- if (ctx.operator.getType() == ProjectQueryLexer.ForksOf)- return new ForksOfCriteria(value);- else- return new OwnedByCriteria(value);+ return new ForksOfCriteria(value);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javaindex e69fffb94a..0a5cc05125 100644--- a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java@@ -52,7 +52,6 @@ import io.onedev.server.security.permission.AccessBuildLog;import io.onedev.server.security.permission.CreateProjects;import io.onedev.server.security.permission.EditIssueField;import io.onedev.server.security.permission.JobPermission;-import io.onedev.server.security.permission.ManageProject;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.security.permission.ReadCode;import io.onedev.server.security.permission.SystemAdministration;@@ -137,8 +136,6 @@ public class OneAuthorizingRealm extends AuthorizingRealm {permissions.addAll(getGroupPermissions(group, user));for (UserAuthorization authorization: user.getProjectAuthorizations())permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));- for (Project project: user.getProjects())- permissions.add(new ProjectPermission(project, new ManageProject()));}Group group = groupManager.findAnonymous();if (group != null)diff --git a/server-core/src/main/java/io/onedev/server/util/CollectionUtils.java b/server-core/src/main/java/io/onedev/server/util/CollectionUtils.javaindex 319a0cee2b..774fa91025 100644--- a/server-core/src/main/java/io/onedev/server/util/CollectionUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/CollectionUtils.java@@ -34,5 +34,5 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUtfor (int i=0; i<args.length/2; i++)map.put(args[i*2], args[i*2+1]);}-+}diff --git a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.javaindex 6f309e0e39..395419445f 100644--- a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java@@ -69,8 +69,6 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {public static Collection<User> getAuthorizedUsers(Project project, Permission permission) {Collection<User> authorizedUsers = new HashSet<>();authorizedUsers.add(OneDev.getInstance(UserManager.class).getRoot());- if (project.getOwner() != null)- authorizedUsers.add(project.getOwner());Group anonymousGroup = OneDev.getInstance(GroupManager.class).findAnonymous();for (GroupAuthorization authorization: project.getGroupAuthorizations()) {Group group = authorization.getGroup();diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex 961ee66d22..d129bfaf52 100644--- a/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -16,11 +16,7 @@ import org.unbescape.java.JavaEscape;import com.google.common.collect.Lists;import io.onedev.server.util.GroovyUtils;-import io.onedev.server.util.Usage;-import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.inputspec.showcondition.ShowCondition;-import io.onedev.server.util.inputspec.showcondition.ValueIsNotAnyOf;-import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.editable.annotation.Editable;@@ -209,18 +205,6 @@ public abstract class InputSpec implements Serializable {buffer.append("\n");}}-- public void onRenameInput(String oldName, String newName) {- if (showCondition != null) {- if (oldName.equals(showCondition.getInputName()))- showCondition.setInputName(newName);- }- }-- public void onDeleteInput(String inputName) {- if (showCondition != null && showCondition.getInputName().equals(inputName))- showCondition = null;- }public static Class<?> defineClass(String className, String description, Collection<? extends InputSpec> inputs) {StringBuffer buffer = new StringBuffer();@@ -255,22 +239,6 @@ public abstract class InputSpec implements Serializable {return (Class<?>) GroovyUtils.evalScript(buffer.toString(), new HashMap<>());}- public void onRenameUser(String oldName, String newName) {-- }-- public void onRenameGroup(String oldName, String newName) {-- }-- public Usage onDeleteUser(String userName) {- return new Usage();- }-- public Usage onDeleteGroup(String groupName) {- return new Usage();- }-public abstract List<String> convertToStrings(@Nullable Object object);/**@@ -292,41 +260,6 @@ public abstract class InputSpec implements Serializable {return EditableUtils.getDisplayName(getClass());}- public boolean onEditInputValues(String fieldName, ValueSetEdit valueSetEdit) {- if (showCondition != null && showCondition.getInputName().equals(fieldName)) {- if (showCondition.getValueMatcher() instanceof ValueIsOneOf) {- ValueIsOneOf valueIsOneOf = (ValueIsOneOf) showCondition.getValueMatcher();- valueIsOneOf.getValues().removeAll(valueSetEdit.getDeletions());- for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {- int index = valueIsOneOf.getValues().indexOf(entry.getKey());- if (index != -1) {- if (valueIsOneOf.getValues().contains(entry.getValue()))- valueIsOneOf.getValues().remove(index);- else- valueIsOneOf.getValues().set(index, entry.getValue());- }- }- if (valueIsOneOf.getValues().isEmpty())- showCondition = null;- } else if (showCondition.getValueMatcher() instanceof ValueIsNotAnyOf) {- ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) showCondition.getValueMatcher();- valueIsNotAnyOf.getValues().removeAll(valueSetEdit.getDeletions());- for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {- int index = valueIsNotAnyOf.getValues().indexOf(entry.getKey());- if (index != -1) {- if (valueIsNotAnyOf.getValues().contains(entry.getValue()))- valueIsNotAnyOf.getValues().remove(index);- else- valueIsNotAnyOf.getValues().set(index, entry.getValue());- }- }- if (valueIsNotAnyOf.getValues().isEmpty())- showCondition = null;- }- }- return false;- }-public boolean checkListElements(Object value, Class<?> elementClass) {if (value instanceof List) {for (Object element: (List<?>)value) {diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.javaindex ebeca91db8..65ccc21744 100755--- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java@@ -1,7 +1,6 @@package io.onedev.server.util.inputspec.choiceinput.choiceprovider;import java.io.Serializable;-import java.util.UUID;import org.hibernate.validator.constraints.NotEmpty;@@ -13,21 +12,10 @@ public class Choice implements Serializable {private static final long serialVersionUID = 1L;- private String uuid = UUID.randomUUID().toString();-private String value;private String color = "#0d87e9";- @Editable- public String getUuid() {- return uuid;- }-- public void setUuid(String uuid) {- this.uuid = uuid;- }-@Editable(order=100)@NotEmptypublic String getValue() {diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.javaindex 1788861798..ac19a5a203 100644--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java+++ b/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java@@ -84,8 +84,6 @@ public class JobMatch extends Criteria<Build> {switch (fieldName) {case Build.FIELD_PROJECT:return new ProjectCriteria(fieldValue);- case Build.FIELD_PROJECT_OWNER:- return new ProjectOwnerCriteria(fieldValue);case Build.FIELD_JOB:return new NameCriteria(fieldValue);default:diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectOwnerCriteria.java b/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectOwnerCriteria.javadeleted file mode 100644index 0cebe42b39..0000000000--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectOwnerCriteria.java+++ /dev/null@@ -1,42 +0,0 @@-package io.onedev.server.util.jobmatch;--import static io.onedev.server.model.Build.FIELD_PROJECT_OWNER;-import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;-import static io.onedev.server.util.jobmatch.JobMatchLexer.Is;--import io.onedev.server.model.Build;-import io.onedev.server.util.criteria.Criteria;-import io.onedev.server.util.match.WildcardUtils;--public class ProjectOwnerCriteria extends Criteria<Build> {-- private static final long serialVersionUID = 1L;-- private String ownerName;-- public ProjectOwnerCriteria(String ownerName) {- this.ownerName = ownerName;- }-- @Override- public boolean matches(Build build) {- return WildcardUtils.matchString(ownerName, build.getProject().getOwner().getName());- }-- @Override- public void onRenameUser(String oldName, String newName) {- if (oldName.equals(ownerName))- ownerName = newName;- }-- @Override- public boolean isUsingUser(String userName) {- return userName.equals(ownerName);- }-- @Override- public String asString() {- return quote(FIELD_PROJECT_OWNER) + " " + getRuleName(Is) + " " + quote(ownerName);- }--}diff --git a/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.java b/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.javaindex 9b0f05030d..87d7a1996f 100644--- a/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.java+++ b/server-core/src/main/java/io/onedev/server/util/script/ScriptContribution.java@@ -29,8 +29,6 @@ public abstract class ScriptContribution {User user = OneDev.getInstance(UserManager.class).find(commit.getCommitterIdent());if (user != null)return user.getName();- else if (build.getProject().getOwner() != null)- return build.getProject().getOwner().getName();elsereturn null;} else {diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex ead557bca4..c177acdf79 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -22,7 +22,7 @@ import io.onedev.server.web.page.admin.group.create.NewGroupPage;import io.onedev.server.web.page.admin.group.membership.GroupMembershipsPage;import io.onedev.server.web.page.admin.group.profile.GroupProfilePage;import io.onedev.server.web.page.admin.issuesetting.DefaultBoardListPage;-import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;+import io.onedev.server.web.page.admin.issuesetting.StateTransitionsPage;import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;import io.onedev.server.web.page.admin.issuesetting.IssueStateListPage;import io.onedev.server.web.page.admin.jobexecutor.JobExecutorsPage;@@ -37,24 +37,16 @@ import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;import io.onedev.server.web.page.admin.user.UserListPage;import io.onedev.server.web.page.admin.user.authorization.UserAuthorizationsPage;import io.onedev.server.web.page.admin.user.avatar.UserAvatarPage;-import io.onedev.server.web.page.admin.user.buildsetting.UserActionAuthorizationsPage;-import io.onedev.server.web.page.admin.user.buildsetting.UserBuildPreservationsPage;-import io.onedev.server.web.page.admin.user.buildsetting.UserJobSecretsPage;import io.onedev.server.web.page.admin.user.create.NewUserPage;import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.user.password.UserPasswordPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;-import io.onedev.server.web.page.admin.user.webhook.UserWebHooksPage;-import io.onedev.server.web.page.build.BuildListPage;+import io.onedev.server.web.page.builds.BuildListPage;import io.onedev.server.web.page.init.ServerInitPage;-import io.onedev.server.web.page.issue.IssueListPage;+import io.onedev.server.web.page.issues.IssueListPage;import io.onedev.server.web.page.my.avatar.MyAvatarPage;-import io.onedev.server.web.page.my.buildsetting.MyActionAuthorizationsPage;-import io.onedev.server.web.page.my.buildsetting.MyBuildPreservationsPage;-import io.onedev.server.web.page.my.buildsetting.MyJobSecretsPage;import io.onedev.server.web.page.my.password.MyPasswordPage;import io.onedev.server.web.page.my.profile.MyProfilePage;-import io.onedev.server.web.page.my.webhook.MyWebHooksPage;import io.onedev.server.web.page.project.NewProjectPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@@ -73,8 +65,8 @@ import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;-import io.onedev.server.web.page.project.issues.detail.IssueBuildsPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.page.project.issues.detail.IssueBuildsPage;import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;@@ -90,18 +82,16 @@ import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePimport io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionsPage;-import io.onedev.server.web.page.project.setting.build.ProjectActionAuthorizationsPage;-import io.onedev.server.web.page.project.setting.build.ProjectBuildPreservationsPage;-import io.onedev.server.web.page.project.setting.build.ProjectJobSecretsPage;+import io.onedev.server.web.page.project.setting.build.ActionAuthorizationsPage;+import io.onedev.server.web.page.project.setting.build.BuildPreservationsPage;+import io.onedev.server.web.page.project.setting.build.JobSecretsPage;import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;-import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;-import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionsPage;-import io.onedev.server.web.page.project.setting.webhook.ProjectWebHooksPage;+import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;import io.onedev.server.web.page.project.stats.ProjectContribsPage;import io.onedev.server.web.page.project.stats.SourceLinesPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;-import io.onedev.server.web.page.pullrequest.PullRequestListPage;+import io.onedev.server.web.page.pullrequests.PullRequestListPage;import io.onedev.server.web.page.security.ForgetPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.page.security.LogoutPage;@@ -127,10 +117,6 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("my/profile", MyProfilePage.class));add(new OnePageMapper("my/avatar", MyAvatarPage.class));add(new OnePageMapper("my/password", MyPasswordPage.class));- add(new OnePageMapper("my/build-setting/job-secrets", MyJobSecretsPage.class));- add(new OnePageMapper("my/build-setting/action-authorizations", MyActionAuthorizationsPage.class));- add(new OnePageMapper("my/build-setting/build-preserve-rules", MyBuildPreservationsPage.class));- add(new OnePageMapper("my/web-hooks", MyWebHooksPage.class));}private void addResources() {@@ -160,11 +146,6 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));add(new OnePageMapper("administration/users/${user}/avatar", UserAvatarPage.class));add(new OnePageMapper("administration/users/${user}/password", UserPasswordPage.class));- add(new OnePageMapper("administration/users/${user}/build-setting", UserJobSecretsPage.class));- add(new OnePageMapper("administration/users/${user}/build-setting/job-secrets", UserJobSecretsPage.class));- add(new OnePageMapper("administration/users/${user}/build-setting/action-authorizations", UserActionAuthorizationsPage.class));- add(new OnePageMapper("administration/users/${user}/build-setting/build-preserve-rules", UserBuildPreservationsPage.class));- add(new OnePageMapper("administration/users/${user}/web-hooks", UserWebHooksPage.class));add(new OnePageMapper("administration/roles", RoleListPage.class));add(new OnePageMapper("administration/roles/new", NewRolePage.class));@@ -189,7 +170,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("administration/settings/issue-fields", IssueFieldListPage.class));add(new OnePageMapper("administration/settings/issue-states", IssueStateListPage.class));- add(new OnePageMapper("administration/settings/state-transitions", DefaultStateTransitionsPage.class));+ add(new OnePageMapper("administration/settings/state-transitions", StateTransitionsPage.class));add(new OnePageMapper("administration/settings/issue-boards", DefaultBoardListPage.class));add(new OnePageMapper("administration/server-log", ServerLogPage.class));@@ -248,13 +229,10 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/settings/avatar-edit", AvatarEditPage.class));add(new OnePageMapper("projects/${project}/settings/branch-protection", BranchProtectionsPage.class));add(new OnePageMapper("projects/${project}/settings/tag-protection", TagProtectionsPage.class));- add(new OnePageMapper("projects/${project}/settings/build/job-secrets", ProjectJobSecretsPage.class));- add(new OnePageMapper("projects/${project}/settings/build/action-authorizations", ProjectActionAuthorizationsPage.class));- add(new OnePageMapper("projects/${project}/settings/build/build-preserve-rules", ProjectBuildPreservationsPage.class));- add(new OnePageMapper("projects/${project}/settings/issue/state-transitions", StateTransitionsPage.class));- add(new OnePageMapper("projects/${project}/settings/issue/prompt-fields-upon-issue-open",- PromptFieldsUponIssueOpenSettingPage.class));- add(new OnePageMapper("projects/${project}/settings/web-hooks", ProjectWebHooksPage.class));+ add(new OnePageMapper("projects/${project}/settings/build/job-secrets", JobSecretsPage.class));+ add(new OnePageMapper("projects/${project}/settings/build/action-authorizations", ActionAuthorizationsPage.class));+ add(new OnePageMapper("projects/${project}/settings/build/build-preserve-rules", BuildPreservationsPage.class));+ add(new OnePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));}}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/inputspec/input-spec.css b/server-core/src/main/java/io/onedev/server/web/asset/inputspec/input-spec.cssindex 5fc9414765..6e20657dfb 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/inputspec/input-spec.css+++ b/server-core/src/main/java/io/onedev/server/web/asset/inputspec/input-spec.css@@ -1,6 +1,3 @@-.floating.input-spec .property-uuid, .input-spec-edit .property-uuid {- display: none;-}.floating.input-spec>.content>.body>div>.bean-viewer>.bean-properties>table>tbody>tr>td.name {min-width: 150px;}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.javaindex e43e928ec0..c52f89768b 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java@@ -66,8 +66,6 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {return SuggestionUtils.suggestProjects(matchWith);elsereturn null;- } else if (fieldName.equals(Project.FIELD_OWNER)) {- return SuggestionUtils.suggestUsers(matchWith);} else {return null;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationListPanel.javadeleted file mode 100644index 36b131e5fc..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationListPanel.java+++ /dev/null@@ -1,46 +0,0 @@-package io.onedev.server.web.component.build.authorization;--import java.io.Serializable;-import java.util.List;--import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.panel.Panel;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.PropertyEditor;--@SuppressWarnings("serial")-public abstract class ActionAuthorizationListPanel extends Panel {-- private final ActionAuthorizationsBean bean;-- public ActionAuthorizationListPanel(String id, ActionAuthorizationsBean bean) {- super(id);- this.bean = bean;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "actionAuthorizations");-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();- getSession().success("Action authorization rules saved");- onSaved(bean.getActionAuthorizations());- }-- };- form.add(new NotificationPanel("feedback", form));- form.add(editor);- add(form);- }-- protected abstract void onSaved(List<ActionAuthorization> actionAuthorizations);-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.javadeleted file mode 100644index 6e4e9c674a..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.java+++ /dev/null@@ -1,46 +0,0 @@-package io.onedev.server.web.component.build.perservation;--import java.io.Serializable;-import java.util.List;--import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.panel.Panel;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.server.model.support.build.BuildPreservation;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.PropertyEditor;--@SuppressWarnings("serial")-public abstract class BuildPreservationListPanel extends Panel {-- private final BuildPreservationsBean bean;-- public BuildPreservationListPanel(String id, BuildPreservationsBean bean) {- super(id);- this.bean = bean;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "buildPreservations");-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();- getSession().success("Build preserve rules saved");- onSaved(bean.getBuildPreservations());- }-- };- form.add(new NotificationPanel("feedback", form));- form.add(editor);- add(form);- }-- protected abstract void onSaved(List<BuildPreservation> buildPreservations);-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex b99d97884c..75956d5d42 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -46,7 +46,7 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.pullrequest.RequestStatusLabel;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;-import io.onedev.server.web.page.build.BuildListPage;+import io.onedev.server.web.page.builds.BuildListPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.CursorSupport;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex 6d4bc4882b..0335008d94 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -114,7 +114,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementadd(milestoneChoice);Collection<String> properties = IssueUtils.getPropertyNames(getProject(),- fieldBeanClass, getProject().getIssueSetting().getPromptFieldsUponIssueOpen(true));+ fieldBeanClass, getIssueSetting().getPromptFieldsUponIssueOpen());add(fieldEditor = new BeanContext(fieldBean.getClass(), properties, false).renderForEdit("fields", Model.of(fieldBean)));}@@ -165,7 +165,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementissue.setDescription(descriptionInput.getConvertedInput());issue.setMilestone(milestoneChoice.getConvertedInput());- Collection<String> fieldNames = getProject().getIssueSetting().getPromptFieldsUponIssueOpen(true);+ Collection<String> fieldNames = getIssueSetting().getPromptFieldsUponIssueOpen();issue.setFieldValues(IssueUtils.getFieldValues(fieldEditor.newComponentContext(), fieldEditor.getConvertedInput(), fieldNames));setConvertedInput(issue);} catch (ConversionException e) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex 786f95f52b..91d639ba19 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -32,6 +32,7 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.issue.TransitionSpec;import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;@@ -84,7 +85,7 @@ public abstract class IssueOperationsPanel extends Panel {RepeatingView transitionsView = new RepeatingView("transitions");- List<TransitionSpec> transitions = getIssue().getProject().getIssueSetting().getTransitionSpecs(true);+ List<TransitionSpec> transitions = OneDev.getInstance(SettingManager.class).getIssueSetting().getTransitionSpecs();AtomicReference<Component> activeTransitionLinkRef = new AtomicReference<>(null);for (TransitionSpec transition: transitions) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/ReconcileUtils.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/ReconcileUtils.javanew file mode 100644index 0000000000..a36f2af83f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/ReconcileUtils.java@@ -0,0 +1,17 @@+package io.onedev.server.web.component.issue.workflowreconcile;++import java.util.List;++public class ReconcileUtils {++ public static void renameItem(List<String> list, String oldItem, String newItem) {+ int index = list.indexOf(oldItem);+ if (index != -1) {+ if (list.contains(newItem))+ list.remove(index);+ else+ list.set(index, newItem);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/ValueSetEdit.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValuesResolution.javasimilarity index 64%rename from server-core/src/main/java/io/onedev/server/util/ValueSetEdit.javarename to server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValuesResolution.javaindex 922527a4c6..596a2e1551 100644--- a/server-core/src/main/java/io/onedev/server/util/ValueSetEdit.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValuesResolution.java@@ -1,10 +1,10 @@-package io.onedev.server.util;+package io.onedev.server.web.component.issue.workflowreconcile;import java.io.Serializable;import java.util.Collection;import java.util.Map;-public class ValueSetEdit implements Serializable {+public class UndefinedFieldValuesResolution implements Serializable {private static final long serialVersionUID = 1L;@@ -12,7 +12,7 @@ public class ValueSetEdit implements Serializable {private final Collection<String> deletions;- public ValueSetEdit(Map<String, String> renames, Collection<String> deletions) {+ public UndefinedFieldValuesResolution(Map<String, String> renames, Collection<String> deletions) {this.renames = renames;this.deletions = deletions;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.javaindex 3faa5b66ba..a9238a83f6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.java@@ -1,27 +1,47 @@package io.onedev.server.web.component.issue.workflowreconcile;import java.io.Serializable;+import java.util.ArrayList;import java.util.List;-import java.util.stream.Collectors;++import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.util.EditContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.editable.annotation.ShowCondition;@Editablepublic class UndefinedStateResolution implements Serializable {private static final long serialVersionUID = 1L;+ public enum FixType {CHANGE_TO_ANOTHER_STATE, DELETE_THIS_STATE}++ private FixType fixType = FixType.CHANGE_TO_ANOTHER_STATE;+private String newState;- @Editable- @ChoiceProvider("getNewStateChoices")+ @Editable(order=50)+ @NotNull+ @OmitName+ public FixType getFixType() {+ return fixType;+ }++ public void setFixType(FixType fixType) {+ this.fixType = fixType;+ }++ @Editable(order=100)+ @ChoiceProvider("getStateChoices")+ @ShowCondition("isNewStateVisible")@OmitName@NotEmptypublic String getNewState() {@@ -33,9 +53,14 @@ public class UndefinedStateResolution implements Serializable {}@SuppressWarnings("unused")- private static List<String> getNewStateChoices() {+ private static boolean isNewStateVisible() {+ return EditContext.get().getInputValue("fixType") == FixType.CHANGE_TO_ANOTHER_STATE;+ }++ @SuppressWarnings("unused")+ private static List<String> getStateChoices() {GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- return issueSetting.getStateSpecs().stream().map(each->each.getName()).collect(Collectors.toList());+ return new ArrayList<>(issueSetting.getStateSpecMap().keySet());}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.htmlindex b5b1262bae..28d61a0e2f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.html@@ -1,3 +1,3 @@<wicket:panel>- <div class="alert alert-warning">Issue workflow has been changed, please <a wicket:id="reconcile">reconcile</a> existing issues with the change</div>+ <div class="alert alert-warning">Issue workflow changed, <a wicket:id="reconcile">reconciliation</a> needs to be performed to make data consistent</div></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.javaindex 23705237a5..4d204fca2a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.java@@ -2,11 +2,10 @@ package io.onedev.server.web.component.issue.workflowreconcile;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.event.IEvent;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;@@ -21,6 +20,13 @@ public abstract class WorkflowChangeAlertPanel extends Panel {super(id);}+ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof WorkflowChanged)+ ((WorkflowChanged)event.getPayload()).getHandler().add(this);+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -44,15 +50,10 @@ public abstract class WorkflowChangeAlertPanel extends Panel {};}-- @Override- public IModel<?> getBody() {- return Model.of("reconcile");- }});} else {- add(new Label("reconcile", "contact site administrator to reconcile") {+ add(new Label("reconcile", "reconciliation (need administrator permission)") {@Overrideprotected void onComponentTag(ComponentTag tag) {@@ -62,7 +63,8 @@ public abstract class WorkflowChangeAlertPanel extends Panel {});}-++ setOutputMarkupPlaceholderTag(true);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChanged.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChanged.javanew file mode 100644index 0000000000..f5e1fc4700--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChanged.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.issue.workflowreconcile;++import org.apache.wicket.ajax.AjaxRequestTarget;++import io.onedev.server.web.util.AjaxPayload;++public class WorkflowChanged extends AjaxPayload {++ public WorkflowChanged(AjaxRequestTarget target) {+ super(target);+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.htmlindex 0f60f43814..b49f7c2eb4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.html@@ -10,7 +10,8 @@</div><div class="modal-body"><div class="alert alert-warning">- Undefined states found, please map it to existing states below+ Please resolve undefined states below. Note that if you select to delete an undefined state,+ all issues with that state will be deleted</div><table class="table table-condensed"><thead>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.javaindex bb05000916..c19b26fc60 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java@@ -26,7 +26,6 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.ajaxlistener.ChangeTextListener;import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;import io.onedev.server.web.ajaxlistener.SelfDisableListener;@@ -303,7 +302,7 @@ public abstract class WorkflowReconcilePanel extends Panel {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- Map<String, ValueSetEdit> edits = new HashMap<>();+ Map<String, UndefinedFieldValuesResolution> edits = new HashMap<>();Collection<String> fieldNames = new HashSet<>();for (UndefinedFieldValue key: resolutions.keySet())fieldNames.add(key.getFieldName());@@ -318,7 +317,7 @@ public abstract class WorkflowReconcilePanel extends Panel {deletions.add(entry.getKey().getFieldValue());}}- edits.put(fieldName, new ValueSetEdit(renames, deletions));+ edits.put(fieldName, new UndefinedFieldValuesResolution(renames, deletions));}getIssueManager().fixUndefinedFieldValues(edits);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/workflow-reconcile.css b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/workflow-reconcile.cssindex 0e3e1556e5..d98580d2ab 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/workflow-reconcile.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/workflow-reconcile.css@@ -3,14 +3,12 @@font-size: 18px;}.fix-states .undefined {- font-size: 18px;width: 50%;}.fix-fields td.name, .fix-fields td.type,.fix-field-values td.name, .fix-field-values td.value {width: 25%;- font-size: 18px;}.fix-fields td.resolution, .fix-field-values td.resolution {width: 50%;diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/SettingInOwnerLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/SettingInOwnerLink.javadeleted file mode 100644index 7cce4332b7..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/link/SettingInOwnerLink.java+++ /dev/null@@ -1,57 +0,0 @@-package io.onedev.server.web.component.link;--import org.apache.wicket.Page;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.model.IModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.model.Project;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.web.page.admin.user.UserPage;-import io.onedev.server.web.page.project.ProjectListPage;--public class SettingInOwnerLink extends BookmarkablePageLink<Project> {-- private static final long serialVersionUID = 1L;-- public SettingInOwnerLink(String id, IModel<Project> projectModel, Class<? extends Page> userSettingPageClass,- Class<? extends Page> mySettingPageClass) {- super(id, getPageClass(projectModel.getObject(), userSettingPageClass, mySettingPageClass),- getPageParameters(projectModel.getObject(), userSettingPageClass, mySettingPageClass));- setModel(projectModel);- }-- private static Class<? extends Page> getPageClass(Project project, Class<? extends Page> userSettingPageClass,- Class<? extends Page> mySettingPageClass) {- if (SecurityUtils.isAdministrator())- return userSettingPageClass;- else if (project.getOwner().equals(SecurityUtils.getUser()))- return mySettingPageClass;- else- return ProjectListPage.class;- }-- private static PageParameters getPageParameters(Project project, Class<? extends Page> userSettingPageClass,- Class<? extends Page> mySettingPageClass) {- if (SecurityUtils.isAdministrator())- return UserPage.paramsOf(project.getOwner());- else- return new PageParameters();- }-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(SecurityUtils.isAdministrator() || getModelObject().getOwner().equals(SecurityUtils.getUser()));- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- onConfigure();- if (!isEnabled())- tag.setName("span");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex f4f70f5119..a7b0d61830 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -55,8 +55,6 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.project.avatar.ProjectAvatar;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;-import io.onedev.server.web.component.user.ident.Mode;-import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.page.project.NewProjectPage;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.PagingHistorySupport;@@ -275,22 +273,6 @@ public class ProjectListPanel extends Panel {}});- columns.add(new AbstractColumn<Project, Void>(Model.of("Owner")) {-- @Override- public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,- IModel<Project> rowModel) {- Project project = rowModel.getObject();- cellItem.add(new UserIdentPanel(componentId, project.getOwner(), Mode.AVATAR_AND_NAME));- }-- @Override- public String getCssClass() {- return "owner";- }-- });-columns.add(new AbstractColumn<Project, Void>(Model.of("Last Update")) {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java b/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.javadeleted file mode 100644index da870d80cd..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/user/UserDeleteLink.java+++ /dev/null@@ -1,83 +0,0 @@-package io.onedev.server.web.component.user;--import org.apache.wicket.Component;-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.request.cycle.RequestCycle;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.User;-import io.onedev.server.search.entity.project.ProjectQuery;-import io.onedev.server.search.entity.project.ProjectQueryLexer;-import io.onedev.server.util.SecurityUtils;-import io.onedev.server.model.Project;-import io.onedev.server.util.criteria.Criteria;-import io.onedev.server.web.component.modal.confirm.ConfirmModal;-import io.onedev.server.web.component.modal.message.MessageModal;-import io.onedev.server.web.page.project.ProjectListPage;--@SuppressWarnings("serial")-public abstract class UserDeleteLink extends AjaxLink<Void> {-- public UserDeleteLink(String id) {- super(id);- }-- @Override- public void onClick(AjaxRequestTarget target) {- if (!getUser().getProjects().isEmpty()) {- new MessageModal(target) {-- @Override- protected Component newMessageContent(String componentId) {- String query = Criteria.quote(Project.FIELD_OWNER) + " "- + ProjectQuery.getRuleName(ProjectQueryLexer.Is) + " "- + Criteria.quote(getUser().getName());- PageParameters params = ProjectListPage.paramsOf(query, 0, 0);- String url = RequestCycle.get().urlFor(ProjectListPage.class, params).toString();- String html = String.format("There are <a href='%s'>projects owned by this user</a>. "- + "Please change owner of these projects to be under other users, or delete "- + "them if no longer needed", url);- return new Label(componentId, html).setEscapeModelStrings(false);- }-- };- } else {- new ConfirmModal(target) {-- @Override- protected void onConfirm(AjaxRequestTarget target) {- OneDev.getInstance(UserManager.class).delete(getUser());- onDeleted(target);- }-- @Override- protected String getConfirmInput() {- return null;- }-- @Override- protected String getConfirmMessage() {- return "Do you really want to delete user '" + getUser().getDisplayName() + "'?";- }-- };- }- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.isAdministrator()- && !getUser().isRoot()- && !getUser().equals(SecurityUtils.getUser()));- }-- protected abstract User getUser();-- protected abstract void onDeleted(AjaxRequestTarget target);--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.javaindex 81a31b158d..ec60805605 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java@@ -3,9 +3,9 @@ package io.onedev.server.web.component.user.profileedit;import java.io.Serializable;import org.apache.wicket.Session;-import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;@@ -16,10 +16,11 @@ import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.web.component.user.UserDeleteLink;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.admin.user.UserListPage;+import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")public class ProfileEditPanel extends GenericPanel<User> {@@ -90,19 +91,23 @@ public class ProfileEditPanel extends GenericPanel<User> {form.add(new FencedFeedbackPanel("feedback", form).setEscapeModelStrings(false));- form.add(new UserDeleteLink("delete") {+ form.add(new Link<Void>("delete") {@Override- protected User getUser() {- return ProfileEditPanel.this.getUser();+ public void onClick() {+ OneDev.getInstance(UserManager.class).delete(getUser());+ setResponsePage(UserListPage.class);}@Override- protected void onDeleted(AjaxRequestTarget target) {- setResponsePage(UserListPage.class);+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.isAdministrator()+ && !getUser().isRoot()+ && !getUser().equals(SecurityUtils.getUser()));}- });+ }.add(new ConfirmOnClick("Do you really want to delete user '" + getUser().getDisplayName() + "'?")));add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListCssResourceReference.javadeleted file mode 100644index 584d6cef26..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.component.webhook;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class WebHookListCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public WebHookListCssResourceReference() {- super(WebHookListCssResourceReference.class, "web-hook-list.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListPanel.htmldeleted file mode 100644index 3b5196d43f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListPanel.html+++ /dev/null@@ -1,11 +0,0 @@-<wicket:panel>- <div class="web-hook-list">- <form wicket:id="form" class="leave-confirm">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- <div class="actions">- <input type="submit" value="Save" class="dirty-aware btn btn-primary">- </div>- </form>- </div>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListPanel.javadeleted file mode 100644index 8ef512e3ca..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHookListPanel.java+++ /dev/null@@ -1,54 +0,0 @@-package io.onedev.server.web.component.webhook;--import java.io.Serializable;-import java.util.ArrayList;--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.panel.Panel;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.server.model.support.WebHook;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.editable.PropertyEditor;--@SuppressWarnings("serial")-public abstract class WebHookListPanel extends Panel {-- private final WebHooksBean bean;-- public WebHookListPanel(String id, WebHooksBean bean) {- super(id);- this.bean = bean;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "webHooks");-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();- getSession().success("Web hooks saved");- onSaved(bean.getWebHooks());- }-- };- form.add(new NotificationPanel("feedback", form));- form.add(editor);- add(form);- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new WebHookListCssResourceReference()));- }-- protected abstract void onSaved(ArrayList<WebHook> webHooks);-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/webhook/web-hook-list.css b/server-core/src/main/java/io/onedev/server/web/component/webhook/web-hook-list.cssdeleted file mode 100644index 8d57af95bf..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/webhook/web-hook-list.css+++ /dev/null@@ -1,9 +0,0 @@-.web-hook-list table thead th {- font-weight: bold !important;-}-.web-hook-list table thead th.property-eventTypes {- width: 25%;-}-.web-hook-list table .select2-container {- width: 100%;-}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java b/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.javaindex 0730ebe14b..598ff21723 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/JobSecretEditBean.java@@ -34,7 +34,7 @@ public class JobSecretEditBean implements Serializable {private static List<String> getSecretChoices() {List<String> secretNames = new ArrayList<>();ProjectBlobPage page = (ProjectBlobPage) WicketUtils.getPage();- for (JobSecret secret: page.getProject().getBuildSetting().getHierarchySecrets(page.getProject()))+ for (JobSecret secret: page.getProject().getBuildSetting().getJobSecrets())secretNames.add(secret.getName());return secretNames;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.javaindex a161f47e93..7ef4610989 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java@@ -53,8 +53,8 @@ public class DefaultBoardListPage extends IssueSettingPage {}private int getBoardSpecIndex(String boardName) {- for (int i=0; i<getSetting().getDefaultBoardSpecs().size(); i++) {- if (getSetting().getDefaultBoardSpecs().get(i).getName().equals(boardName))+ for (int i=0; i<getSetting().getBoardSpecs().size(); i++) {+ if (getSetting().getBoardSpecs().get(i).getName().equals(boardName))return i;}return -1;@@ -68,7 +68,7 @@ public class DefaultBoardListPage extends IssueSettingPage {@Overrideprotected Component newContent(String id, ModalPanel modal) {- return new BoardEditPanel(id, getSetting().getDefaultBoardSpecs(), -1) {+ return new BoardEditPanel(id, getSetting().getBoardSpecs(), -1) {@Overrideprotected void onBoardSaved(AjaxRequestTarget target, BoardSpec board) {@@ -155,7 +155,7 @@ public class DefaultBoardListPage extends IssueSettingPage {@Overrideprotected List<BoardSpec> getData() {- return getSetting().getDefaultBoardSpecs();+ return getSetting().getBoardSpecs();}};@@ -173,10 +173,10 @@ public class DefaultBoardListPage extends IssueSettingPage {int toIndex = to.getItemIndex();if (fromIndex < toIndex) {for (int i=0; i<toIndex-fromIndex; i++)- Collections.swap(getSetting().getDefaultBoardSpecs(), fromIndex+i, fromIndex+i+1);+ Collections.swap(getSetting().getBoardSpecs(), fromIndex+i, fromIndex+i+1);} else {for (int i=0; i<fromIndex-toIndex; i++)- Collections.swap(getSetting().getDefaultBoardSpecs(), fromIndex-i, fromIndex-i-1);+ Collections.swap(getSetting().getBoardSpecs(), fromIndex-i, fromIndex-i-1);}OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());@@ -208,7 +208,7 @@ public class DefaultBoardListPage extends IssueSettingPage {new SideFloating(target, SideFloating.Placement.RIGHT) {private BoardSpec getBoard() {- return getSetting().getDefaultBoardSpecs().get(index);+ return getSetting().getBoardSpecs().get(index);}@Override@@ -235,7 +235,7 @@ public class DefaultBoardListPage extends IssueSettingPage {@Overrideprotected Component newContent(String id, ModalPanel modal) {sideFloating.close();- return new BoardEditPanel(id, getSetting().getDefaultBoardSpecs(), index) {+ return new BoardEditPanel(id, getSetting().getBoardSpecs(), index) {@Overrideprotected void onBoardSaved(AjaxRequestTarget target, BoardSpec board) {@@ -263,7 +263,7 @@ public class DefaultBoardListPage extends IssueSettingPage {@Overridepublic void onClick(AjaxRequestTarget target) {- getSetting().getDefaultBoardSpecs().remove(index);+ getSetting().getBoardSpecs().remove(index);OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());target.add(boardsTable);close();diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.javaindex 8dcfc43482..43eaae1582 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java@@ -1,35 +1,30 @@package io.onedev.server.web.page.admin.issuesetting;import java.util.ArrayList;-import java.util.HashMap;-import java.util.HashSet;import java.util.List;-import java.util.Map;-import java.util.Set;import org.apache.commons.lang3.SerializationUtils;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.event.Broadcast;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.issue.fieldspec.ChoiceField;import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChanged;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;@@ -51,7 +46,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {FieldBean bean = new FieldBean();if (fieldIndex != -1) {bean.setField(SerializationUtils.clone(getSetting().getFieldSpecs().get(fieldIndex)));- bean.setPromptUponIssueOpen(getSetting().getDefaultPromptFieldsUponIssueOpen().contains(bean.getField().getName()));+ bean.setPromptUponIssueOpen(getSetting().getPromptFieldsUponIssueOpen().contains(bean.getField().getName()));}Form<?> form = new Form<Void>("form") {@@ -100,63 +95,31 @@ abstract class FieldEditPanel extends Panel implements InputContext {}if (editor.isValid()) {- boolean displayInList;if (fieldIndex != -1) {FieldSpec oldField = getSetting().getFieldSpecs().get(fieldIndex);if (!field.getName().equals(oldField.getName())) {- getSetting().onRenameField(oldField.getName(), field.getName());- OneDev.getInstance(RoleManager.class).onRenameIssueField(oldField.getName(), field.getName());getSetting().setReconciled(false);- }- getSetting().getFieldSpecs().set(fieldIndex, field);- getSetting().getDefaultPromptFieldsUponIssueOpen().remove(oldField.getName());- displayInList = getSetting().getListFields().remove(oldField.getName());- if (oldField instanceof ChoiceField && field instanceof ChoiceField) {+ } else if (oldField instanceof ChoiceField && field instanceof ChoiceField) {ChoiceField oldChoiceInput = (ChoiceField) oldField;ChoiceField choiceInput = (ChoiceField) field;if (oldChoiceInput.getChoiceProvider() instanceof SpecifiedChoices&& choiceInput.getChoiceProvider() instanceof SpecifiedChoices) {SpecifiedChoices oldChoices = (SpecifiedChoices) oldChoiceInput.getChoiceProvider();SpecifiedChoices choices = (SpecifiedChoices) choiceInput.getChoiceProvider();- Map<String, String> valueRenames = new HashMap<>();- Set<String> valueDeletions = new HashSet<>();- Map<String, String> uuid2value = new HashMap<>();- Map<String, Integer> uuid2order = new HashMap<>();- for (int i=0; i<choices.getChoices().size(); i++) {- Choice choice = choices.getChoices().get(i);- uuid2value.put(choice.getUuid(), choice.getValue());- uuid2order.put(choice.getUuid(), i);- }- for (int i=0; i<oldChoices.getChoices().size(); i++) {- Choice oldChoice = oldChoices.getChoices().get(i);- String newValue = uuid2value.get(oldChoice.getUuid());- if (newValue != null) {- if (!newValue.equals(oldChoice.getValue())) {- valueRenames.put(oldChoice.getValue(), newValue);- getSetting().setReconciled(false);- }- } else {- valueDeletions.add(oldChoice.getValue());- getSetting().setReconciled(false);- }- Integer newOrder = uuid2order.get(oldChoice.getUuid());- if (newOrder == null || newOrder != i)- getSetting().setReconciled(false);- }- if (!valueRenames.isEmpty() || !valueDeletions.isEmpty()) {- getSetting().onEditFieldValues(null, field.getName(),- new ValueSetEdit(valueRenames, valueDeletions));- }+ if (!choices.getChoiceValues().containsAll(oldChoices.getChoiceValues()))+ getSetting().setReconciled(false);}}+ getSetting().getFieldSpecs().set(fieldIndex, field);+ getSetting().getPromptFieldsUponIssueOpen().remove(oldField.getName());++ if (!getSetting().isReconciled())+ send(getPage(), Broadcast.BREADTH, new WorkflowChanged(target));} else {getSetting().getFieldSpecs().add(field);- displayInList = true;}if (bean.isPromptUponIssueOpen())- getSetting().getDefaultPromptFieldsUponIssueOpen().add(field.getName());- if (displayInList)- getSetting().getListFields().add(field.getName());+ getSetting().getPromptFieldsUponIssueOpen().add(field.getName());OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());onSave(target);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.javaindex 2e7f11758f..29a1248620 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java@@ -9,6 +9,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.Broadcast;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;@@ -31,7 +32,6 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.administration.GlobalIssueSetting;@@ -39,6 +39,7 @@ import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;+import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChanged;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;@@ -254,7 +255,7 @@ public class IssueFieldListPage extends IssueSettingPage {Fragment fragment = new Fragment(id, "viewFieldFrag", IssueFieldListPage.this);fragment.add(BeanContext.view("viewer1", field, Sets.newHashSet("name"), true));FieldBean bean = new FieldBean();- bean.setPromptUponIssueOpen(getSetting().getDefaultPromptFieldsUponIssueOpen().contains(field.getName()));+ bean.setPromptUponIssueOpen(getSetting().getPromptFieldsUponIssueOpen().contains(field.getName()));fragment.add(BeanContext.view("viewer2", bean, Sets.newHashSet("field"), true));fragment.add(new ModalLink("edit") {@@ -294,11 +295,8 @@ public class IssueFieldListPage extends IssueSettingPage {@Overridepublic void onClick(AjaxRequestTarget target) {getSetting().getFieldSpecs().remove(index);- getSetting().getDefaultPromptFieldsUponIssueOpen().remove(field.getName());- getSetting().getListFields().remove(field.getName());- getSetting().onDeleteField(field.getName());- OneDev.getInstance(RoleManager.class).onDeleteIssueField(field.getName());getSetting().setReconciled(false);+ send(getPage(), Broadcast.BREADTH, new WorkflowChanged(target));OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());target.add(fieldsTable);close();diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.htmlindex c2e99b3a3f..8797445e0b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.html@@ -1,6 +1,7 @@<wicket:extend><div class="page-title">Issue Setting</div><div id="issue-setting">+ <div wicket:id="workflowChangeAlert"></div><ul wicket:id="issueSettingTabs" class="tabs nav nav-tabs"></ul><wicket:child></wicket:child></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.javaindex f8e8c6fb7e..5f29d4bfe2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.admin.issuesetting;import java.util.ArrayList;import java.util.List;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.model.Model;@@ -11,6 +12,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;@@ -29,10 +31,20 @@ public class IssueSettingPage extends AdministrationPage {@Overrideprotected void onInitialize() {super.onInitialize();++ add(new WorkflowChangeAlertPanel("workflowChangeAlert") {++ @Override+ protected void onCompleted(AjaxRequestTarget target) {+ setResponsePage(getPage().getClass(), getPageParameters());+ }++ });+List<Tab> tabs = new ArrayList<>();tabs.add(new PageTab(Model.of("Custom Fields"), IssueFieldListPage.class));tabs.add(new PageTab(Model.of("States"), IssueStateListPage.class));- tabs.add(new PageTab(Model.of("Default State Transitions"), DefaultStateTransitionsPage.class));+ tabs.add(new PageTab(Model.of("State Transitions"), StateTransitionsPage.class));tabs.add(new PageTab(Model.of("Default Boards"), DefaultBoardListPage.class));add(new Tabbable("issueSettingTabs", tabs));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.javaindex 30965fa7df..debbbf24c5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java@@ -9,6 +9,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.Broadcast;import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;@@ -36,6 +37,7 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;+import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChanged;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;@@ -262,12 +264,11 @@ public class IssueStateListPage extends IssueSettingPage {@Overridepublic void onClick(AjaxRequestTarget target) {- StateSpec state = getState();getSetting().getStateSpecs().remove(index);- getSetting().onDeleteState(state.getName());getSetting().setReconciled(false);OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());target.add(statesTable);+ send(getPage(), Broadcast.BREADTH, new WorkflowChanged(target));close();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.javaindex 0289c77870..1bd374c175 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java@@ -5,6 +5,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.event.Broadcast;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;@@ -16,6 +17,7 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;+import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChanged;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;@@ -88,8 +90,8 @@ abstract class StateEditPanel extends Panel {if (stateIndex != -1) {StateSpec oldState = getSetting().getStateSpecs().get(stateIndex);if (!state.getName().equals(oldState.getName())) {- getSetting().onRenameState(oldState.getName(), state.getName());getSetting().setReconciled(false);+ send(getPage(), Broadcast.BREADTH, new WorkflowChanged(target));}getSetting().getStateSpecs().set(stateIndex, state);} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateTransitionsPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateTransitionsPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateTransitionsPage.javasimilarity index 78%rename from server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateTransitionsPage.javaindex 3aeb75ca33..1eddfc7437 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateTransitionsPage.java@@ -9,9 +9,9 @@ import io.onedev.server.web.component.issue.statetransition.StateTransitionListPimport io.onedev.server.web.component.issue.statetransition.UseDefaultListener;@SuppressWarnings("serial")-public class DefaultStateTransitionsPage extends IssueSettingPage {+public class StateTransitionsPage extends IssueSettingPage {- public DefaultStateTransitionsPage(PageParameters params) {+ public StateTransitionsPage(PageParameters params) {super(params);}@@ -19,7 +19,7 @@ public class DefaultStateTransitionsPage extends IssueSettingPage {protected void onInitialize() {super.onInitialize();- add(new StateTransitionListPanel("content", getSetting().getDefaultTransitionSpecs()) {+ add(new StateTransitionListPanel("content", getSetting().getTransitionSpecs()) {@Overrideprotected void onChanged(AjaxRequestTarget target) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.htmlindex 348f9fffb0..a742c3a6f5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.html@@ -2,6 +2,7 @@<div class="page-title">Role Detail</div><div class="role"><form wicket:id="form" class="leave-confirm">+ <div class="alert alert-info manager-note">This built-in role has full permissions over a project</div><div wicket:id="editor"></div><div wicket:id="feedback"></div><div class="actions clearfix">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.javaindex 8844269051..f7c2c7cef9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java@@ -5,6 +5,7 @@ import java.io.Serializable;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.RestartResponseException;import org.apache.wicket.Session;+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;@@ -14,6 +15,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;+import com.google.common.collect.Sets;+import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.RoleManager;@@ -75,7 +78,7 @@ public class RoleDetailPage extends AdministrationPage {editor.getDescriptor().copyProperties(object, getRole());}- });+ }, getRole().isManager()?Sets.newHashSet("name"):Sets.newHashSet(), !getRole().isManager());Form<?> form = new Form<Void>("form") {@@ -98,6 +101,10 @@ public class RoleDetailPage extends AdministrationPage {}};++ if (getRole().isManager())+ form.add(AttributeAppender.append("class", "manager"));+form.add(editor);form.add(new FencedFeedbackPanel("feedback", form).setEscapeModelStrings(false));@@ -112,6 +119,12 @@ public class RoleDetailPage extends AdministrationPage {error(e.getMessage());}}++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getRole().isManager());+ }}.add(new ConfirmOnClick("Do you really want to delete role '" + getRole().getName() + "'?")));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.javaindex 3ffc9fda63..2024136182 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java@@ -12,6 +12,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.form.TextField;@@ -143,10 +144,19 @@ public class RoleListPage extends AdministrationPage {}}+ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled()) {+ tag.put("disabled", "disabled");+ tag.put("title", "This is a built-in role and can not be deleted");+ }+ }+@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.isAdministrator());+ setEnabled(!rowModel.getObject().isManager());}}.add(new ConfirmOnClick("Do you really want to delete role '" + role.getName() + "'?")));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/role.css b/server-core/src/main/java/io/onedev/server/web/page/admin/role/role.cssindex e69de29bb2..3ea2532035 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/role.css+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/role.css@@ -0,0 +1,6 @@+.role>form>.manager-note, .role>form.manager .help-block {+ display: none;+}+.role>form.manager>.manager-note {+ display: block;+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.javaindex 78e3456bf7..b7f7667572 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java@@ -48,7 +48,6 @@ import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;import io.onedev.server.web.component.datatable.DefaultDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.modal.confirm.ConfirmModal;-import io.onedev.server.web.component.user.UserDeleteLink;import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Password;@@ -56,6 +55,7 @@ import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.page.admin.user.create.NewUserPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;import io.onedev.server.web.page.project.ProjectListPage;+import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")@@ -279,19 +279,34 @@ public class UserListPage extends AdministrationPage {public void populateItem(Item<ICellPopulator<User>> cellItem, String componentId, IModel<User> rowModel) {Fragment fragment = new Fragment(componentId, "actionFrag", UserListPage.this);- fragment.add(new UserDeleteLink("delete") {+ fragment.add(new Link<Void>("delete") {@Override- protected User getUser() {- return rowModel.getObject();+ public void onClick() {+ OneDev.getInstance(UserManager.class).delete(rowModel.getObject());+ setResponsePage(UserListPage.class, getPageParameters());}@Override- protected void onDeleted(AjaxRequestTarget target) {- setResponsePage(UserListPage.class, getPageParameters());+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled())+ tag.put("disabled", "disabled");+ User user = rowModel.getObject();+ if (user.isRoot())+ tag.put("title", "Root user can not be deleted");+ else if (user.equals(SecurityUtils.getUser()))+ tag.put("title", "You can not delete yourself");}-- });++ @Override+ protected void onConfigure() {+ super.onConfigure();+ User user = rowModel.getObject();+ setEnabled(!user.isRoot() && !user.equals(SecurityUtils.getUser()));+ }++ }.add(new ConfirmOnClick("Do you really want to delete user '" + rowModel.getObject().getDisplayName() + "'?")));fragment.add(new Link<Void>("impersonate") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex 945ae6b512..9a2781459c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -30,13 +30,10 @@ import io.onedev.server.web.component.user.avatar.UserAvatar;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.page.admin.user.authorization.UserAuthorizationsPage;import io.onedev.server.web.page.admin.user.avatar.UserAvatarPage;-import io.onedev.server.web.page.admin.user.buildsetting.UserBuildSettingPage;-import io.onedev.server.web.page.admin.user.buildsetting.UserJobSecretsPage;import io.onedev.server.web.page.admin.user.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.user.password.UserPasswordPage;import io.onedev.server.web.page.admin.user.profile.UserProfilePage;import io.onedev.server.web.page.admin.user.ssh.UserSshKeysPage;-import io.onedev.server.web.page.admin.user.webhook.UserWebHooksPage;@SuppressWarnings("serial")public abstract class UserPage extends AdministrationPage {@@ -104,9 +101,6 @@ public abstract class UserPage extends AdministrationPage {tabs.add(new UserTab("Ssh Keys", "fa fa-fw fa-shield", UserSshKeysPage.class));}- tabs.add(new UserTab("Build Setting", "fa fa-fw fa-play-circle", UserJobSecretsPage.class, UserBuildSettingPage.class));- tabs.add(new UserTab("Web Hooks", "fa fa-fw fa-volume-up", UserWebHooksPage.class, UserWebHooksPage.class));-return tabs;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserActionAuthorizationsPage.htmldeleted file mode 100644index 9eda6f96cf..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserActionAuthorizationsPage.html+++ /dev/null@@ -1,6 +0,0 @@-<wicket:extend>- <div class="help-block">Define common rules to authorize build actions for all projects owned- by current user. A build action will be allowed as long as one rule allows it. All build actions- will be allowed if no rules defined</div>- <div wicket:id="actionAuthorizations"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserActionAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserActionAuthorizationsPage.javadeleted file mode 100644index 0bd6d2e139..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserActionAuthorizationsPage.java+++ /dev/null@@ -1,39 +0,0 @@-package io.onedev.server.web.page.admin.user.buildsetting;--import java.util.List;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;-import io.onedev.server.web.component.build.authorization.ActionAuthorizationListPanel;-import io.onedev.server.web.component.build.authorization.ActionAuthorizationsBean;--@SuppressWarnings("serial")-public class UserActionAuthorizationsPage extends UserBuildSettingPage {-- public UserActionAuthorizationsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- ActionAuthorizationsBean bean = new ActionAuthorizationsBean();- bean.setActionAuthorizations(getBuildSetting().getActionAuthorizations());- add(new ActionAuthorizationListPanel("actionAuthorizations", bean) {-- @Override- protected void onSaved(List<ActionAuthorization> actionAuthorizations) {- getBuildSetting().setActionAuthorizations(actionAuthorizations);- OneDev.getInstance(UserManager.class).save(getUser());- setResponsePage(UserActionAuthorizationsPage.class,- UserActionAuthorizationsPage.paramsOf(getUser()));- }-- });- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.htmldeleted file mode 100644index b91eb3d318..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.html+++ /dev/null@@ -1,6 +0,0 @@-<wicket:extend>- <div class="help-block">Define common rules to preserve builds for all projects owned- by current user. A build will be preserved as long as one rule preserves it. All builds- will be preserved if no rules are defined</div>- <div wicket:id="buildPreservations"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.javadeleted file mode 100644index 524d4b3375..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildPreservationsPage.java+++ /dev/null@@ -1,39 +0,0 @@-package io.onedev.server.web.page.admin.user.buildsetting;--import java.util.List;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.build.BuildPreservation;-import io.onedev.server.web.component.build.perservation.BuildPreservationListPanel;-import io.onedev.server.web.component.build.perservation.BuildPreservationsBean;--@SuppressWarnings("serial")-public class UserBuildPreservationsPage extends UserBuildSettingPage {-- public UserBuildPreservationsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- BuildPreservationsBean bean = new BuildPreservationsBean();- bean.setBuildPreservations(getBuildSetting().getBuildPreservations());- add(new BuildPreservationListPanel("buildPreservations", bean) {-- @Override- protected void onSaved(List<BuildPreservation> buildPreservations) {- getBuildSetting().setBuildPreservations(buildPreservations);- OneDev.getInstance(UserManager.class).save(getUser());- setResponsePage(UserBuildPreservationsPage.class,- UserBuildPreservationsPage.paramsOf(getUser()));- }-- });- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.javadeleted file mode 100644index 6e394be8aa..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.java+++ /dev/null@@ -1,36 +0,0 @@-package io.onedev.server.web.page.admin.user.buildsetting;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.model.support.build.UserBuildSetting;-import io.onedev.server.web.component.tabbable.Tab;-import io.onedev.server.web.component.tabbable.Tabbable;-import io.onedev.server.web.page.admin.user.UserPage;-import io.onedev.server.web.page.admin.user.UserTab;--@SuppressWarnings("serial")-public abstract class UserBuildSettingPage extends UserPage {-- public UserBuildSettingPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- List<Tab> tabs = new ArrayList<>();- tabs.add(new UserTab("Job Secrets", null, UserJobSecretsPage.class));- tabs.add(new UserTab("Action Authorizations", null, UserActionAuthorizationsPage.class));- tabs.add(new UserTab("Build Preserve Rules", null, UserBuildPreservationsPage.class));- add(new Tabbable("buildSettingTabs", tabs));- }-- protected UserBuildSetting getBuildSetting() {- return getUser().getBuildSetting();- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserJobSecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserJobSecretsPage.htmldeleted file mode 100644index 591512083d..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserJobSecretsPage.html+++ /dev/null@@ -1,4 +0,0 @@-<wicket:extend>- <div wicket:id="note" class="help-block"></div>- <div wicket:id="jobSecrets"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserJobSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserJobSecretsPage.javadeleted file mode 100644index b3efcaed50..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserJobSecretsPage.java+++ /dev/null@@ -1,45 +0,0 @@-package io.onedev.server.web.page.admin.user.buildsetting;--import java.util.List;--import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.build.JobSecret;-import io.onedev.server.util.inputspec.SecretInput;-import io.onedev.server.web.component.build.secret.JobSecretListPanel;-import io.onedev.server.web.component.build.secret.JobSecretsBean;--@SuppressWarnings("serial")-public class UserJobSecretsPage extends UserBuildSettingPage {-- public UserJobSecretsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- JobSecretsBean bean = new JobSecretsBean();- bean.setSecrets(getBuildSetting().getJobSecrets());- add(new JobSecretListPanel("jobSecrets", bean) {-- @Override- protected void onSaved(List<JobSecret> secrets) {- getBuildSetting().setJobSecrets(secrets);- OneDev.getInstance(UserManager.class).save(getUser());- setResponsePage(UserJobSecretsPage.class, UserJobSecretsPage.paramsOf(getUser()));- }-- });-- String note = String.format("Define common job secrets to be used in all projects "- + "owned by current user. Secret value less than %d characters will not be masked "- + "in build log", SecretInput.MASK.length());- add(new Label("note", note).setEscapeModelStrings(false));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/webhook/UserWebHooksPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/webhook/UserWebHooksPage.htmldeleted file mode 100644index d0a596a5e1..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/webhook/UserWebHooksPage.html+++ /dev/null@@ -1,7 +0,0 @@-<wicket:extend>- <div class="page-title">Web Hooks</div>- <div class="help-block">- Define common web hooks for all projects owned by current user- </div>- <div wicket:id="webHooks"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/webhook/UserWebHooksPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/webhook/UserWebHooksPage.javadeleted file mode 100644index 43e90e6c5d..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/webhook/UserWebHooksPage.java+++ /dev/null@@ -1,39 +0,0 @@-package io.onedev.server.web.page.admin.user.webhook;--import java.util.ArrayList;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.WebHook;-import io.onedev.server.web.component.webhook.WebHookListPanel;-import io.onedev.server.web.component.webhook.WebHooksBean;-import io.onedev.server.web.page.admin.user.UserPage;--@SuppressWarnings("serial")-public class UserWebHooksPage extends UserPage {-- public UserWebHooksPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- WebHooksBean bean = new WebHooksBean();- bean.setWebHooks(getUser().getWebHooks());- add(new WebHookListPanel("webHooks", bean) {-- @Override- protected void onSaved(ArrayList<WebHook> webHooks) {- getUser().setWebHooks(bean.getWebHooks());- OneDev.getInstance(UserManager.class).save(getUser());- setResponsePage(UserWebHooksPage.class, UserWebHooksPage.paramsOf(getUser()));- }-- });- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.html b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.javasimilarity index 99%rename from server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.javarename to server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.javaindex f6730fd6e5..5f52fdcf71 100644--- a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.build;+package io.onedev.server.web.page.builds;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.html b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.javasimilarity index 99%rename from server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.javarename to server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.javaindex 269f0a416b..096817f104 100644--- a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.issue;+package io.onedev.server.web.page.issues;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/BuildListTab.java b/server-core/src/main/java/io/onedev/server/web/page/layout/BuildListTab.javaindex 7f609d3a34..2c3997c9bc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/BuildListTab.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/BuildListTab.java@@ -5,7 +5,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.build.BuildListPage;+import io.onedev.server.web.page.builds.BuildListPage;public class BuildListTab implements MainTab {diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/IssueListTab.java b/server-core/src/main/java/io/onedev/server/web/page/layout/IssueListTab.javaindex 0d9d3d16ba..e53ca7f95d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/IssueListTab.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/IssueListTab.java@@ -5,7 +5,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.issue.IssueListPage;+import io.onedev.server.web.page.issues.IssueListPage;public class IssueListTab implements MainTab {diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex c5112eb276..f25c77a153 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -66,8 +66,6 @@<li wicket:id="myAvatar"><a wicket:id="link"><i class="fa fa-fw fa-picture-o"></i> Edit Avatar</a></li><li wicket:id="myPassword"><a wicket:id="link"><i class="fa fa-fw fa-key"></i> Change Password</a></li><li wicket:id="mySshKeys"><a wicket:id="link"><i class="fa fa-fw fa-shield"></i> Ssh Keys</a></li>- <li wicket:id="myBuildSetting"><a wicket:id="link"><i class="fa fa-fw fa-play-circle"></i> Build Setting</a></li>- <li wicket:id="myWebHooks"><a wicket:id="link"><i class="fa fa-fw fa-volume-up"></i> Web Hooks</a></li><li role="separator" class="divider"></li><li><a wicket:id="signOut"><i class="fa fa-fw fa-sign-out"></i> <span wicket:id="label"></span></a></li></ul>diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex a867dfbb79..1ed937765d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -47,12 +47,9 @@ import io.onedev.server.web.page.admin.user.create.NewUserPage;import io.onedev.server.web.page.base.BasePage;import io.onedev.server.web.page.my.MyPage;import io.onedev.server.web.page.my.avatar.MyAvatarPage;-import io.onedev.server.web.page.my.buildsetting.MyBuildSettingPage;-import io.onedev.server.web.page.my.buildsetting.MyJobSecretsPage;import io.onedev.server.web.page.my.password.MyPasswordPage;import io.onedev.server.web.page.my.profile.MyProfilePage;import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;-import io.onedev.server.web.page.my.webhook.MyWebHooksPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.page.security.LogoutPage;@@ -217,16 +214,6 @@ public abstract class LayoutPage extends BasePage {item.add(AttributeAppender.append("class", "active"));item.setVisible(isSshEnabled());- signedInContainer.add(item = new WebMarkupContainer("myBuildSetting"));- item.add(new ViewStateAwarePageLink<Void>("link", MyJobSecretsPage.class));- if (getPage() instanceof MyBuildSettingPage)- item.add(AttributeAppender.append("class", "active"));-- signedInContainer.add(item = new WebMarkupContainer("myWebHooks"));- item.add(new ViewStateAwarePageLink<Void>("link", MyWebHooksPage.class));- if (getPage() instanceof MyWebHooksPage)- item.add(AttributeAppender.append("class", "active"));-PrincipalCollection prevPrincipals = SecurityUtils.getSubject().getPreviousPrincipals();if (prevPrincipals != null && !prevPrincipals.getPrimaryPrincipal().equals(0L)) {Link<Void> signOutLink = new Link<Void>("signOut") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/PullRequestListTab.java b/server-core/src/main/java/io/onedev/server/web/page/layout/PullRequestListTab.javaindex d97277ee7d..2509c850f5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/PullRequestListTab.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/PullRequestListTab.java@@ -5,7 +5,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.page.pullrequest.PullRequestListPage;+import io.onedev.server.web.page.pullrequests.PullRequestListPage;public class PullRequestListTab implements MainTab {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyActionAuthorizationsPage.htmldeleted file mode 100644index 8b62918d79..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyActionAuthorizationsPage.html+++ /dev/null@@ -1,6 +0,0 @@-<wicket:extend>- <div class="help-block">Define common rules to authorize build actions of all projects owned by me.- A build action will be allowed as long as one rule allows it. All build actions will be allowed- if no rules defined</div>- <div wicket:id="actionAuthorizations"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyActionAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyActionAuthorizationsPage.javadeleted file mode 100644index 1af36eb28f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyActionAuthorizationsPage.java+++ /dev/null@@ -1,38 +0,0 @@-package io.onedev.server.web.page.my.buildsetting;--import java.util.List;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;-import io.onedev.server.web.component.build.authorization.ActionAuthorizationListPanel;-import io.onedev.server.web.component.build.authorization.ActionAuthorizationsBean;--@SuppressWarnings("serial")-public class MyActionAuthorizationsPage extends MyBuildSettingPage {-- public MyActionAuthorizationsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- ActionAuthorizationsBean bean = new ActionAuthorizationsBean();- bean.setActionAuthorizations(getBuildSetting().getActionAuthorizations());- add(new ActionAuthorizationListPanel("actionAuthorizations", bean) {-- @Override- protected void onSaved(List<ActionAuthorization> actionAuthorizations) {- getBuildSetting().setActionAuthorizations(actionAuthorizations);- OneDev.getInstance(UserManager.class).save(getLoginUser());- setResponsePage(MyActionAuthorizationsPage.class);- }-- });- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.htmldeleted file mode 100644index e2eef3e8b5..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.html+++ /dev/null@@ -1,6 +0,0 @@-<wicket:extend>- <div class="help-block">Define common rules to preserve builds of all projects owned by me.- A build will be preserved as long as one rule preserves it. All builds will be preserved- if no rules defined</div>- <div wicket:id="buildPreservations"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.javadeleted file mode 100644index 74a6da539c..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildPreservationsPage.java+++ /dev/null@@ -1,38 +0,0 @@-package io.onedev.server.web.page.my.buildsetting;--import java.util.List;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.build.BuildPreservation;-import io.onedev.server.web.component.build.perservation.BuildPreservationListPanel;-import io.onedev.server.web.component.build.perservation.BuildPreservationsBean;--@SuppressWarnings("serial")-public class MyBuildPreservationsPage extends MyBuildSettingPage {-- public MyBuildPreservationsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- BuildPreservationsBean bean = new BuildPreservationsBean();- bean.setBuildPreservations(getBuildSetting().getBuildPreservations());- add(new BuildPreservationListPanel("buildPreservations", bean) {-- @Override- protected void onSaved(List<BuildPreservation> buildPreservations) {- getBuildSetting().setBuildPreservations(buildPreservations);- OneDev.getInstance(UserManager.class).save(getLoginUser());- setResponsePage(MyBuildPreservationsPage.class);- }-- });- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.htmldeleted file mode 100644index 7d7d288e62..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.html+++ /dev/null@@ -1,7 +0,0 @@-<wicket:extend>- <div class="page-title">Build Setting</div>- <div class="build-setting">- <ul wicket:id="buildSettingTabs" class="nav nav-tabs"></ul>- <wicket:child></wicket:child>- </div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.javadeleted file mode 100644index 758638d342..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyBuildSettingPage.java+++ /dev/null@@ -1,37 +0,0 @@-package io.onedev.server.web.page.my.buildsetting;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.model.support.build.UserBuildSetting;-import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.Tab;-import io.onedev.server.web.component.tabbable.Tabbable;-import io.onedev.server.web.page.my.MyPage;--@SuppressWarnings("serial")-public abstract class MyBuildSettingPage extends MyPage {-- public MyBuildSettingPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- List<Tab> tabs = new ArrayList<>();- tabs.add(new PageTab(Model.of("Job Secrets"), MyJobSecretsPage.class));- tabs.add(new PageTab(Model.of("Action Authorizations"), MyActionAuthorizationsPage.class));- tabs.add(new PageTab(Model.of("Build Preserve Rules"), MyBuildPreservationsPage.class));- add(new Tabbable("buildSettingTabs", tabs));- }-- protected UserBuildSetting getBuildSetting() {- return getLoginUser().getBuildSetting();- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyJobSecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyJobSecretsPage.htmldeleted file mode 100644index 591512083d..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyJobSecretsPage.html+++ /dev/null@@ -1,4 +0,0 @@-<wicket:extend>- <div wicket:id="note" class="help-block"></div>- <div wicket:id="jobSecrets"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyJobSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyJobSecretsPage.javadeleted file mode 100644index fabd2518bc..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/buildsetting/MyJobSecretsPage.java+++ /dev/null@@ -1,45 +0,0 @@-package io.onedev.server.web.page.my.buildsetting;--import java.util.List;--import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.build.JobSecret;-import io.onedev.server.util.inputspec.SecretInput;-import io.onedev.server.web.component.build.secret.JobSecretListPanel;-import io.onedev.server.web.component.build.secret.JobSecretsBean;--@SuppressWarnings("serial")-public class MyJobSecretsPage extends MyBuildSettingPage {-- public MyJobSecretsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- JobSecretsBean bean = new JobSecretsBean();- bean.setSecrets(getBuildSetting().getJobSecrets());- add(new JobSecretListPanel("jobSecrets", bean) {-- @Override- protected void onSaved(List<JobSecret> secrets) {- getBuildSetting().setJobSecrets(secrets);- OneDev.getInstance(UserManager.class).save(getLoginUser());- setResponsePage(MyJobSecretsPage.class);- }-- });-- String note = String.format("Define common job secrets to be used in all projects "- + "owned by me. Secret value less than %d characters will not be masked "- + "in build log", SecretInput.MASK.length());- add(new Label("note", note).setEscapeModelStrings(false));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/webhook/MyWebHooksPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/webhook/MyWebHooksPage.htmldeleted file mode 100644index 08d76b1191..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/webhook/MyWebHooksPage.html+++ /dev/null@@ -1,7 +0,0 @@-<wicket:extend>- <div class="page-title">Web Hooks</div>- <div class="help-block">- Define common web hooks for all projects owned by me- </div>- <div wicket:id="webHooks"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/webhook/MyWebHooksPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/webhook/MyWebHooksPage.javadeleted file mode 100644index b82f4968a1..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/webhook/MyWebHooksPage.java+++ /dev/null@@ -1,39 +0,0 @@-package io.onedev.server.web.page.my.webhook;--import java.util.ArrayList;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.support.WebHook;-import io.onedev.server.web.component.webhook.WebHookListPanel;-import io.onedev.server.web.component.webhook.WebHooksBean;-import io.onedev.server.web.page.my.MyPage;--@SuppressWarnings("serial")-public class MyWebHooksPage extends MyPage {-- public MyWebHooksPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- WebHooksBean bean = new WebHooksBean();- bean.setWebHooks(getLoginUser().getWebHooks());- add(new WebHookListPanel("webHooks", bean) {-- @Override- protected void onSaved(ArrayList<WebHook> webHooks) {- getLoginUser().setWebHooks(bean.getWebHooks());- OneDev.getInstance(UserManager.class).save(getLoginUser());- setResponsePage(MyWebHooksPage.class);- }-- });- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.htmlindex 7457af4d0c..7afaf461f4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html@@ -3,7 +3,6 @@<div class="new-project"><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div>- <div wicket:id="ownerEditor"></div><div class="actions"><input class="btn btn-primary dirty-aware" value="Create" type="submit"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.javaindex 4f8394bac4..8a349afe5b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java@@ -12,7 +12,6 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;@@ -36,8 +35,6 @@ public class NewProjectPage extends LayoutPage {Project project = new Project();Collection<String> properties = Sets.newHashSet("name", "description");- ProjectOwnerBean ownerBean = new ProjectOwnerBean();- ownerBean.setOwner(SecurityUtils.getUser().getName());BeanEditor editor = BeanContext.edit("editor", project, properties, false);@@ -53,7 +50,6 @@ public class NewProjectPage extends LayoutPage {editor.error(new Path(new PathNode.Named("name")),"This name has already been used by another project");} else {- project.setOwner(OneDev.getInstance(UserManager.class).findByName(ownerBean.getOwner()));projectManager.create(project);Session.get().success("New project created");setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));@@ -62,7 +58,6 @@ public class NewProjectPage extends LayoutPage {};form.add(editor);- form.add(BeanContext.edit("ownerEditor", ownerBean).setVisible(SecurityUtils.isAdministrator()));add(form);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectOwnerBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectOwnerBean.javadeleted file mode 100644index 937e89d785..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectOwnerBean.java+++ /dev/null@@ -1,28 +0,0 @@-package io.onedev.server.web.page.project;--import java.io.Serializable;--import org.hibernate.validator.constraints.NotEmpty;--import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.UserChoice;--@Editable-public class ProjectOwnerBean implements Serializable {-- private static final long serialVersionUID = 1L;-- private String owner;-- @Editable- @UserChoice- @NotEmpty- public String getOwner() {- return owner;- }-- public void setOwner(String owner) {- this.owner = owner;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 67c70607d8..2711e9bae2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -63,13 +63,11 @@ import io.onedev.server.web.page.project.setting.ProjectSettingTab;import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionsPage;-import io.onedev.server.web.page.project.setting.build.ProjectBuildSettingPage;-import io.onedev.server.web.page.project.setting.build.ProjectJobSecretsPage;+import io.onedev.server.web.page.project.setting.build.BuildSettingPage;+import io.onedev.server.web.page.project.setting.build.JobSecretsPage;import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;-import io.onedev.server.web.page.project.setting.issue.ProjectIssueSettingPage;-import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionsPage;-import io.onedev.server.web.page.project.setting.webhook.ProjectWebHooksPage;+import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;import io.onedev.server.web.page.project.stats.ProjectContribsPage;import io.onedev.server.web.page.project.stats.ProjectStatsPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;@@ -352,11 +350,9 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {tabs.add(new ProjectSettingTab("Authorizations", "fa fa-fw fa-user", ProjectAuthorizationsPage.class));tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionsPage.class));tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionsPage.class));- tabs.add(new ProjectSettingTab("Issue Setting", "fa fa-fw fa-bug",- StateTransitionsPage.class, ProjectIssueSettingPage.class));tabs.add(new ProjectSettingTab("Build Setting", "fa fa-fw fa-play-circle",- ProjectJobSecretsPage.class, ProjectBuildSettingPage.class));- tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", ProjectWebHooksPage.class));+ JobSecretsPage.class, BuildSettingPage.class));+ tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", WebHooksPage.class));return tabs;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.htmlindex 08554ce2d0..48d9b26616 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.html@@ -6,7 +6,6 @@</div><div class="modal-body"><div wicket:id="editor"></div>- <div wicket:id="ownerEditor"></div></div><div class="modal-footer"><button wicket:id="save" class="btn btn-primary">Ok</button>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.javaindex f08a81e640..4362da788b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java@@ -14,14 +14,12 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;-import io.onedev.server.web.page.project.ProjectOwnerBean;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@SuppressWarnings("serial")@@ -43,8 +41,6 @@ abstract class ForkOptionPanel extends Panel {project.setName(getProject().getName() + "." + SecurityUtils.getUser().getName());Collection<String> properties = Sets.newHashSet("name", "description");- ProjectOwnerBean ownerBean = new ProjectOwnerBean();- ownerBean.setOwner(SecurityUtils.getUser().getName());BeanEditor editor = BeanContext.edit("editor", project, properties, false);@@ -52,7 +48,6 @@ abstract class ForkOptionPanel extends Panel {form.setOutputMarkupId(true);form.add(editor);- form.add(BeanContext.edit("ownerEditor", ownerBean).setVisible(SecurityUtils.isAdministrator()));form.add(new AjaxButton("save") {@@ -66,7 +61,6 @@ abstract class ForkOptionPanel extends Panel {"This name has already been used by another project");target.add(form);} else {- project.setOwner(OneDev.getInstance(UserManager.class).findByName(ownerBean.getOwner()));projectManager.fork(getProject(), project);Session.get().success("Project forked");setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.htmlindex d17f164485..381709e4a6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.html@@ -2,9 +2,6 @@<div class="project-info" id="project-info"><div class="head clearfix"><div wicket:id="name" class="name pull-left"></div>- <div class="owner pull-left">- (owner: <a wicket:id="owner"></a>)- </div><div class="pull-right"><a wicket:id="forks" class="forks"><span wicket:id="label"></span></a><a wicket:id="forkNow" class="fork-now">fork now</a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.javaindex 52faeb2a5f..7cd21c3f42 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java@@ -30,9 +30,7 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.page.admin.user.profile.UserProfilePage;import io.onedev.server.web.page.base.BasePage;-import io.onedev.server.web.page.my.profile.MyProfilePage;import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@@ -54,27 +52,6 @@ public abstract class ProjectInfoPanel extends Panel {add(new Label("name", getProject().getName()));- User owner = getProject().getOwner();- User loggedInUser = SecurityUtils.getUser();-- if (SecurityUtils.isAdministrator()) {- add(new ViewStateAwarePageLink<Void>("owner", UserProfilePage.class, UserProfilePage.paramsOf(owner))- .setBody(Model.of(owner.getDisplayName())));- } else if (owner.equals(loggedInUser)) {- add(new ViewStateAwarePageLink<Void>("owner", MyProfilePage.class)- .setBody(Model.of(owner.getDisplayName())));- } else {- add(new Label("owner", owner.getDisplayName()) {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("span");- }-- });- }-boolean canReadCode = SecurityUtils.canReadCode(getProject());add(new ModalLink("forkNow") {@@ -140,6 +117,7 @@ public abstract class ProjectInfoPanel extends Panel {.setVisible(canReadCode));add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));+ User loggedInUser = SecurityUtils.getUser();boolean userHasNoKeys = loggedInUser.getSshKeys().isEmpty();boolean isSshEnabled = ((BasePage)getPage()).isSshEnabled();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 784b8ff2a7..6320a50e44 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -47,7 +47,6 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.ProjectIssueSetting;import io.onedev.server.search.entity.issue.ChoiceFieldCriteria;import io.onedev.server.search.entity.issue.FieldOperatorCriteria;import io.onedev.server.search.entity.issue.IssueCriteria;@@ -153,11 +152,10 @@ abstract class BoardColumnPanel extends Panel implements EditContext {Issue issue = issueDragging.getIssue();if (Objects.equals(issue.getMilestone(), getMilestone())) {// move issue between board columns- ProjectIssueSetting workflow = getProject().getIssueSetting();String identifyField = getBoard().getIdentifyField();if (identifyField.equals(Issue.FIELD_STATE)) {issue = SerializationUtils.clone(issue);- for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {+ for (TransitionSpec transition: getIssueSetting().getTransitionSpecs()) {if (transition.canTransitManually(issue, getColumn())) {issue.setState(getColumn());break;@@ -341,9 +339,8 @@ abstract class BoardColumnPanel extends Panel implements EditContext {OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, getMilestone());markAccepted(target, issue, true);} else if (fieldName.equals(Issue.FIELD_STATE)) {- ProjectIssueSetting workflow = getProject().getIssueSetting();AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);- for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {+ for (TransitionSpec transition: getIssueSetting().getTransitionSpecs()) {if (transition.canTransitManually(issue, getColumn())) {transitionRef.set(transition);break;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.javaindex 4f22229795..2ca306b3f6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java@@ -14,7 +14,12 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.RoleManager;import io.onedev.server.entitymanager.UserAuthorizationManager;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.GroupAuthorization;+import io.onedev.server.model.Membership;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@@ -43,6 +48,40 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {protected void onSubmit() {super.onSubmit();+ boolean canManageProject = false;+ Project project = getProject();+ User user = SecurityUtils.getUser();+ if (user.isRoot()) {+ canManageProject = true;+ } else {+ for (Membership membership: user.getMemberships()) {+ if (membership.getGroup().isAdministrator()) {+ canManageProject = true;+ } else {+ for (GroupAuthorization authorization: membership.getGroup().getProjectAuthorizations()) {+ if (authorization.getProject().equals(project) && authorization.getRole().isManageProject()) {+ canManageProject = true;+ break;+ }+ }+ }+ if (canManageProject)+ break;+ }+ if (!canManageProject) {+ for (AuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {+ if (authorizationBean.getUserName().equals(user.getName())+ && OneDev.getInstance(RoleManager.class).find(authorizationBean.getRoleName()).isManageProject()) {+ canManageProject = true;+ break;+ }+ }+ }+ }+ if (!canManageProject) {+ error("You can not unauthorize yourself as a manager");+ return;+ }Set<String> userNames = new HashSet<>();Collection<UserAuthorization> authorizations = new ArrayList<>();for (AuthorizationBean authorizationBean: authorizationsBean.getAuthorizations()) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationsBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsBean.javasimilarity index 91%rename from server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationsBean.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsBean.javaindex f70aa17122..53f53be9c0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationsBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.build.authorization;+package io.onedev.server.web.page.project.setting.build;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.htmlnew file mode 100644index 0000000000..e313686b40--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.html@@ -0,0 +1,13 @@+<wicket:extend>+ <div class="help-block">Define rules to authorize build actions. A build action will be allowed+ as long as one rule allows it. All build actions will be allowed if no rules defined</div>+ <div class="action-authorizations">+ <form wicket:id="form" class="leave-confirm">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <div class="actions">+ <input type="submit" value="Save" class="dirty-aware btn btn-primary">+ </div>+ </form>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.javanew file mode 100644index 0000000000..79e6d6a327--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java@@ -0,0 +1,48 @@+package io.onedev.server.web.page.project.setting.build;++import java.io.Serializable;++import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class ActionAuthorizationsPage extends BuildSettingPage {++ public ActionAuthorizationsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ ActionAuthorizationsBean bean = new ActionAuthorizationsBean();+ bean.setActionAuthorizations(getProject().getBuildSetting().getActionAuthorizations());++ PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "actionAuthorizations");++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();+ getSession().success("Action authorization rules saved");+ getProject().getBuildSetting().setActionAuthorizations(bean.getActionAuthorizations());+ OneDev.getInstance(ProjectManager.class).save(getProject());+ setResponsePage(ActionAuthorizationsPage.class,+ ActionAuthorizationsPage.paramsOf(getProject()));+ }++ };+ form.add(new NotificationPanel("feedback", form));+ form.add(editor);+ add(form);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationsBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsBean.javasimilarity index 91%rename from server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationsBean.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsBean.javaindex c7b9d5e0a0..472766b43c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationsBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.build.perservation;+package io.onedev.server.web.page.project.setting.build;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.htmlsimilarity index 50%rename from server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretListPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.htmlindex e791e8f3c4..a7300b57d1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.html@@ -1,5 +1,7 @@-<wicket:panel>- <div class="job-secret-list">+<wicket:extend>+ <div class="help-block">Define rules to preserve builds. A build will be preserved as long as one rule preserves it.+ All builds will be preserved if no rules are defined</div>+ <div class="build-preservations"><form wicket:id="form" class="leave-confirm"><div wicket:id="feedback"></div><div wicket:id="editor"></div>@@ -8,4 +10,4 @@</div></form></div>-</wicket:panel>\ No newline at end of file+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.javanew file mode 100644index 0000000000..605266e349--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java@@ -0,0 +1,48 @@+package io.onedev.server.web.page.project.setting.build;++import java.io.Serializable;++import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyEditor;++@SuppressWarnings("serial")+public class BuildPreservationsPage extends BuildSettingPage {++ public BuildPreservationsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ BuildPreservationsBean bean = new BuildPreservationsBean();+ bean.setBuildPreservations(getProject().getBuildSetting().getBuildPreservations());++ PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "buildPreservations");++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();+ getSession().success("Build preserve rules saved");+ getProject().getBuildSetting().setBuildPreservations(bean.getBuildPreservations());+ OneDev.getInstance(ProjectManager.class).save(getProject());+ setResponsePage(BuildPreservationsPage.class,+ BuildPreservationsPage.paramsOf(getProject()));+ }++ };+ form.add(new NotificationPanel("feedback", form));+ form.add(editor);+ add(form);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/user/buildsetting/UserBuildSettingPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.javasimilarity index 80%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.javaindex 06849a20a3..9b45559883 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java@@ -18,9 +18,9 @@ import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")-public abstract class ProjectBuildSettingPage extends ProjectSettingPage {+public abstract class BuildSettingPage extends ProjectSettingPage {- public ProjectBuildSettingPage(PageParameters params) {+ public BuildSettingPage(PageParameters params) {super(params);}@@ -29,7 +29,7 @@ public abstract class ProjectBuildSettingPage extends ProjectSettingPage {super.onInitialize();List<Tab> tabs = new ArrayList<>();- tabs.add(new PageTab(Model.of("Job Secrets"), ProjectJobSecretsPage.class) {+ tabs.add(new PageTab(Model.of("Job Secrets"), JobSecretsPage.class) {@Overridepublic Component render(String componentId) {@@ -37,7 +37,7 @@ public abstract class ProjectBuildSettingPage extends ProjectSettingPage {}});- tabs.add(new PageTab(Model.of("Action Authorizations"), ProjectActionAuthorizationsPage.class) {+ tabs.add(new PageTab(Model.of("Action Authorizations"), ActionAuthorizationsPage.class) {@Overridepublic Component render(String componentId) {@@ -45,7 +45,7 @@ public abstract class ProjectBuildSettingPage extends ProjectSettingPage {}});- tabs.add(new PageTab(Model.of("Build Preserve Rules"), ProjectBuildPreservationsPage.class) {+ tabs.add(new PageTab(Model.of("Build Preserve Rules"), BuildPreservationsPage.class) {@Overridepublic Component render(String componentId) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretsBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsBean.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretsBean.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsBean.javaindex 78a258024f..0f35bf2a2f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretsBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.build.secret;+package io.onedev.server.web.page.project.setting.build;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.htmlsimilarity index 69%rename from server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationListPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.htmlindex 5cf949df7f..0482beac68 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/authorization/ActionAuthorizationListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.html@@ -1,5 +1,6 @@-<wicket:panel>- <div class="build-preservation-list">+<wicket:extend>+ <div wicket:id="note" class="help-block"></div>+ <div class="job-secrets"><form wicket:id="form" class="leave-confirm"><div wicket:id="feedback"></div><div wicket:id="editor"></div>@@ -8,4 +9,4 @@</div></form></div>-</wicket:panel>\ No newline at end of file+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.javasimilarity index 52%rename from server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretListPanel.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.javaindex 3024a81052..271a9544de 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/secret/JobSecretListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java@@ -1,31 +1,38 @@-package io.onedev.server.web.component.build.secret;+package io.onedev.server.web.page.project.setting.build;import java.io.Serializable;import java.util.HashSet;-import java.util.List;import java.util.Set;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.mapper.parameter.PageParameters;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.support.build.JobSecret;+import io.onedev.server.util.inputspec.SecretInput;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyEditor;@SuppressWarnings("serial")-public abstract class JobSecretListPanel extends Panel {+public class JobSecretsPage extends BuildSettingPage {- private final JobSecretsBean bean;-- public JobSecretListPanel(String id, JobSecretsBean bean) {- super(id);- this.bean = bean;+ public JobSecretsPage(PageParameters params) {+ super(params);}@Overrideprotected void onInitialize() {super.onInitialize();++ String note = String.format("Define job secrets to be used in build spec. Secret value less "+ + "than %d characters will not be masked in build log", SecretInput.MASK.length());+ add(new Label("note", note).setEscapeModelStrings(false));++ JobSecretsBean bean = new JobSecretsBean();+ bean.setSecrets(getProject().getBuildSetting().getJobSecrets());PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "secrets");@@ -45,14 +52,16 @@ public abstract class JobSecretListPanel extends Panel {}}getSession().success("Job secrets saved");- onSaved(bean.getSecrets());+ getProject().getBuildSetting().setJobSecrets(bean.getSecrets());+ OneDev.getInstance(ProjectManager.class).save(getProject());+ setResponsePage(JobSecretsPage.class, JobSecretsPage.paramsOf(getProject()));}};form.add(new NotificationPanel("feedback", form));form.add(editor);add(form);+}- protected abstract void onSaved(List<JobSecret> secrets);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectActionAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectActionAuthorizationsPage.htmldeleted file mode 100644index 8a50d8905c..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectActionAuthorizationsPage.html+++ /dev/null@@ -1,14 +0,0 @@-<wicket:extend>- <div class="help-block">Define rules to authorize build actions. A build action will be allowed- as long as one rule allows it. All build actions will be allowed if no rules defined</div>- <div class="panel panel-default">- <div class="panel-heading"><b>Project Specific</b></div>- <div class="panel-body" wicket:id="projectSpecificActionAuthorizations"></div>- </div>- <div class="panel panel-default">- <div class="panel-heading"><b>Inherited from <a wicket:id="owner">Owner</a></b></div>- <div class="panel-body">- <div wicket:id="inheritedActionAuthorizations"></div>- </div>- </div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectActionAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectActionAuthorizationsPage.javadeleted file mode 100644index 2aa3ea4f44..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectActionAuthorizationsPage.java+++ /dev/null@@ -1,50 +0,0 @@-package io.onedev.server.web.page.project.setting.build;--import java.util.List;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;-import io.onedev.server.web.component.build.authorization.ActionAuthorizationListPanel;-import io.onedev.server.web.component.build.authorization.ActionAuthorizationsBean;-import io.onedev.server.web.component.link.SettingInOwnerLink;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.page.admin.user.buildsetting.UserActionAuthorizationsPage;-import io.onedev.server.web.page.my.buildsetting.MyActionAuthorizationsPage;--@SuppressWarnings("serial")-public class ProjectActionAuthorizationsPage extends ProjectBuildSettingPage {-- public ProjectActionAuthorizationsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- ActionAuthorizationsBean bean = new ActionAuthorizationsBean();- bean.setActionAuthorizations(getProject().getBuildSetting().getActionAuthorizations());- add(new ActionAuthorizationListPanel("projectSpecificActionAuthorizations", bean) {-- @Override- protected void onSaved(List<ActionAuthorization> actionAuthorizations) {- getProject().getBuildSetting().setActionAuthorizations(actionAuthorizations);- OneDev.getInstance(ProjectManager.class).save(getProject());- setResponsePage(ProjectActionAuthorizationsPage.class,- ProjectActionAuthorizationsPage.paramsOf(getProject()));- }-- });-- add(PropertyContext.view("inheritedActionAuthorizations",- getProject().getOwner().getBuildSetting(), "actionAuthorizations"));-- add(new SettingInOwnerLink("owner", projectModel, UserActionAuthorizationsPage.class,- MyActionAuthorizationsPage.class));-- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.htmldeleted file mode 100644index 198d79691a..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.html+++ /dev/null@@ -1,14 +0,0 @@-<wicket:extend>- <div class="help-block">Define rules to preserve builds. A build will be preserved as long as one rule preserves it.- All builds will be preserved if no rules are defined</div>- <div class="panel panel-default">- <div class="panel-heading"><b>Project Specific</b></div>- <div class="panel-body" wicket:id="projectSpecificBuildPreservations"></div>- </div>- <div class="panel panel-default">- <div class="panel-heading"><b>Inherited from <a wicket:id="owner">Owner</a></b></div>- <div class="panel-body">- <div wicket:id="inheritedBuildPreservations"></div>- </div>- </div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.javadeleted file mode 100644index 8565c33f4a..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildPreservationsPage.java+++ /dev/null@@ -1,50 +0,0 @@-package io.onedev.server.web.page.project.setting.build;--import java.util.List;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.support.build.BuildPreservation;-import io.onedev.server.web.component.build.perservation.BuildPreservationListPanel;-import io.onedev.server.web.component.build.perservation.BuildPreservationsBean;-import io.onedev.server.web.component.link.SettingInOwnerLink;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.page.admin.user.buildsetting.UserBuildPreservationsPage;-import io.onedev.server.web.page.my.buildsetting.MyBuildPreservationsPage;--@SuppressWarnings("serial")-public class ProjectBuildPreservationsPage extends ProjectBuildSettingPage {-- public ProjectBuildPreservationsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- BuildPreservationsBean bean = new BuildPreservationsBean();- bean.setBuildPreservations(getProject().getBuildSetting().getBuildPreservations());- add(new BuildPreservationListPanel("projectSpecificBuildPreservations", bean) {-- @Override- protected void onSaved(List<BuildPreservation> buildPreservations) {- getProject().getBuildSetting().setBuildPreservations(buildPreservations);- OneDev.getInstance(ProjectManager.class).save(getProject());- setResponsePage(ProjectBuildPreservationsPage.class,- ProjectBuildPreservationsPage.paramsOf(getProject()));- }-- });-- add(PropertyContext.view("inheritedBuildPreservations",- getProject().getOwner().getBuildSetting(), "buildPreservations"));-- add(new SettingInOwnerLink("owner", projectModel, UserBuildPreservationsPage.class,- MyBuildPreservationsPage.class));-- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.htmldeleted file mode 100644index 7d7d288e62..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.html+++ /dev/null@@ -1,7 +0,0 @@-<wicket:extend>- <div class="page-title">Build Setting</div>- <div class="build-setting">- <ul wicket:id="buildSettingTabs" class="nav nav-tabs"></ul>- <wicket:child></wicket:child>- </div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectJobSecretsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectJobSecretsPage.htmldeleted file mode 100644index 73708eb80f..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectJobSecretsPage.html+++ /dev/null@@ -1,13 +0,0 @@-<wicket:extend>- <div wicket:id="note" class="help-block"></div>- <div class="panel panel-default">- <div class="panel-heading"><b>Project Specific</b></div>- <div wicket:id="projectSpecificJobSecrets" class="panel-body"></div>- </div>- <div class="panel panel-default">- <div class="panel-heading"><b>Inherited from <a wicket:id="owner">Owner</a></b></div>- <div class="panel-body">- <div wicket:id="inheritedJobSecrets"></div>- </div>- </div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectJobSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectJobSecretsPage.javadeleted file mode 100644index d3d06e815e..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectJobSecretsPage.java+++ /dev/null@@ -1,55 +0,0 @@-package io.onedev.server.web.page.project.setting.build;--import java.util.List;--import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.support.build.JobSecret;-import io.onedev.server.util.inputspec.SecretInput;-import io.onedev.server.web.component.build.secret.JobSecretListPanel;-import io.onedev.server.web.component.build.secret.JobSecretsBean;-import io.onedev.server.web.component.link.SettingInOwnerLink;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.page.admin.user.buildsetting.UserJobSecretsPage;-import io.onedev.server.web.page.my.buildsetting.MyJobSecretsPage;--@SuppressWarnings("serial")-public class ProjectJobSecretsPage extends ProjectBuildSettingPage {-- public ProjectJobSecretsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- String note = String.format("Define job secrets to be used in build spec. Secret value less "- + "than %d characters will not be masked in build log", SecretInput.MASK.length());- add(new Label("note", note).setEscapeModelStrings(false));-- JobSecretsBean bean = new JobSecretsBean();- bean.setSecrets(getProject().getBuildSetting().getJobSecrets());- add(new JobSecretListPanel("projectSpecificJobSecrets", bean) {-- @Override- protected void onSaved(List<JobSecret> secrets) {- getProject().getBuildSetting().setJobSecrets(secrets);- OneDev.getInstance(ProjectManager.class).save(getProject());- setResponsePage(ProjectJobSecretsPage.class, ProjectJobSecretsPage.paramsOf(getProject()));- }-- });-- List<JobSecret> inheritedSecrets = getProject().getBuildSetting().getInheritedSecrets(getProject());- bean = new JobSecretsBean();- bean.setSecrets(inheritedSecrets);- add(PropertyContext.view("inheritedJobSecrets", bean, "secrets"));-- add(new SettingInOwnerLink("owner", projectModel, UserJobSecretsPage.class, MyJobSecretsPage.class));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.htmlindex ae98e4aebe..7a80997361 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html@@ -4,7 +4,6 @@<p wicket:id="help" class="help-block"></p><form wicket:id="form" class="leave-confirm"><div wicket:id="editor"></div>- <div wicket:id="ownerEditor"></div><div class="actions"><input class="btn btn-primary dirty-aware" value="Update" type="submit"><a wicket:id="delete" class="delete btn btn-danger pull-right">Delete</a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.javaindex 9f5cd01577..7c0905a56c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java@@ -15,16 +15,13 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.project.ConfirmDeleteProjectModal;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.ProjectListPage;-import io.onedev.server.web.page.project.ProjectOwnerBean;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")@@ -45,8 +42,6 @@ public class GeneralSettingPage extends ProjectSettingPage {add(new Label("help", "Git repository of this project is stored at: " + getProject().getGitDir()));Collection<String> properties = Sets.newHashSet("name", "description");- ProjectOwnerBean ownerBean = new ProjectOwnerBean();- ownerBean.setOwner(getProject().getOwner().getName());editor = BeanContext.editModel("editor", new IModel<Serializable>() {@@ -86,7 +81,6 @@ public class GeneralSettingPage extends ProjectSettingPage {String errorMessage = "This name has already been used by another project";editor.error(new Path(new PathNode.Named("name")), errorMessage);} else {- project.setOwner(OneDev.getInstance(UserManager.class).findByName(ownerBean.getOwner()));projectManager.save(project, oldName);Session.get().success("General setting has been updated");setResponsePage(GeneralSettingPage.class, paramsOf(project));@@ -95,7 +89,6 @@ public class GeneralSettingPage extends ProjectSettingPage {};form.add(editor);- form.add(BeanContext.edit("ownerEditor", ownerBean).setVisible(SecurityUtils.isAdministrator()));form.add(new AjaxLink<Void>("delete") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/ProjectIssueSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/ProjectIssueSettingPage.htmldeleted file mode 100644index cd4a3e1cc9..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/ProjectIssueSettingPage.html+++ /dev/null@@ -1,8 +0,0 @@-<wicket:extend>- <div class="page-title">Issue Setting</div>- <div class="issue-setting">- <div wicket:id="workflowChangeAlert"></div>- <ul wicket:id="issueSettingTabs" class="nav nav-tabs"></ul>- <wicket:child></wicket:child>- </div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/ProjectIssueSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/ProjectIssueSettingPage.javadeleted file mode 100644index a9640ffdaf..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/ProjectIssueSettingPage.java+++ /dev/null@@ -1,87 +0,0 @@-package io.onedev.server.web.page.project.setting.issue;--import java.util.ArrayList;-import java.util.List;--import org.apache.wicket.Component;-import org.apache.wicket.Page;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.ProjectIssueSetting;-import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;-import io.onedev.server.web.component.tabbable.PageTab;-import io.onedev.server.web.component.tabbable.PageTabLink;-import io.onedev.server.web.component.tabbable.Tab;-import io.onedev.server.web.component.tabbable.Tabbable;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.setting.ProjectSettingPage;--@SuppressWarnings("serial")-public abstract class ProjectIssueSettingPage extends ProjectSettingPage {-- public ProjectIssueSettingPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new WorkflowChangeAlertPanel("workflowChangeAlert") {-- @Override- protected void onCompleted(AjaxRequestTarget target) {- setResponsePage(getPageClass(), getPageParameters());- }-- });-- List<Tab> tabs = new ArrayList<>();- tabs.add(new PageTab(Model.of("State Transitions"), StateTransitionsPage.class) {-- @Override- public Component render(String componentId) {- return new TabLink(componentId, this);- }-- });-- tabs.add(new PageTab(Model.of("Prompt Fields Upon Issue Open"), PromptFieldsUponIssueOpenSettingPage.class) {-- @Override- public Component render(String componentId) {- return new TabLink(componentId, this);- }-- });- add(new Tabbable("issueSettingTabs", tabs));- }-- protected ProjectIssueSetting getProjectSetting() {- return getProject().getIssueSetting();- }-- protected GlobalIssueSetting getSetting() {- return OneDev.getInstance(SettingManager.class).getIssueSetting();- }-- private class TabLink extends PageTabLink {-- public TabLink(String id, PageTab tab) {- super(id, tab);- }-- @Override- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new BookmarkablePageLink<Void>(linkId, pageClass, ProjectPage.paramsOf(getProject()));- }-- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.htmldeleted file mode 100644index c6ae7a8ad1..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.html+++ /dev/null@@ -1,9 +0,0 @@-<wicket:extend>- <form wicket:id="form" class="prompt-fields-upon-issue-open-setting">- <input wicket:id="fields" type="hidden" class="form-control">- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save">- <a wicket:id="useDefault" class="btn btn-primary">Use Default</a>- </div>- </form>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.javadeleted file mode 100644index 651483be21..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java+++ /dev/null@@ -1,96 +0,0 @@-package io.onedev.server.web.page.project.setting.issue;--import java.util.Collection;-import java.util.HashSet;-import java.util.LinkedHashMap;-import java.util.Map;--import org.apache.wicket.Session;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.link.Link;-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.entitymanager.ProjectManager;-import io.onedev.server.web.component.stringchoice.StringMultiChoice;--@SuppressWarnings("serial")-public class PromptFieldsUponIssueOpenSettingPage extends ProjectIssueSettingPage {-- private Collection<String> fieldSet;-- public PromptFieldsUponIssueOpenSettingPage(PageParameters params) {- super(params);- fieldSet = getProjectSetting().getPromptFieldsUponIssueOpen(true);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();- getProjectSetting().setPromptFieldsUponIssueOpen(fieldSet);- OneDev.getInstance(ProjectManager.class).save(getProject());- setResponsePage(PromptFieldsUponIssueOpenSettingPage.class, PromptFieldsUponIssueOpenSettingPage.paramsOf(getProject()));- Session.get().success("Setting saved");- }-- };-- form.add(new StringMultiChoice("fields", new IModel<Collection<String>>() {-- @Override- public void detach() {- }-- @Override- public Collection<String> getObject() {- return fieldSet;- }-- @Override- public void setObject(Collection<String> object) {- fieldSet = new HashSet<>(object);- }-- }, new LoadableDetachableModel<Map<String, String>>() {-- @Override- protected Map<String, String> load() {- Map<String, String> choices = new LinkedHashMap<>();- for (String fieldName: getSetting().getFieldNames())- choices.put(fieldName, fieldName);- return choices;- }-- }));-- form.add(new Link<Void>("useDefault") {-- @Override- public void onClick() {- getProjectSetting().setPromptFieldsUponIssueOpen(null);- OneDev.getInstance(ProjectManager.class).save(getProject());- setResponsePage(PromptFieldsUponIssueOpenSettingPage.class, PromptFieldsUponIssueOpenSettingPage.paramsOf(getProject()));- Session.get().success("Reset to default setting");- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getProjectSetting().getPromptFieldsUponIssueOpen(false) != null);- }-- });- add(form);-- form.setOutputMarkupId(true);- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.htmldeleted file mode 100644index 03e5294e35..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="transitions" class="state-transitions"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.javadeleted file mode 100644index 4e3d5ae03d..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java+++ /dev/null@@ -1,57 +0,0 @@-package io.onedev.server.web.page.project.setting.issue;--import java.util.List;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.issue.TransitionSpec;-import io.onedev.server.web.component.issue.statetransition.StateTransitionListPanel;-import io.onedev.server.web.component.issue.statetransition.UseDefaultListener;--@SuppressWarnings("serial")-public class StateTransitionsPage extends ProjectIssueSettingPage {-- private List<TransitionSpec> transitions;-- public StateTransitionsPage(PageParameters params) {- super(params);- transitions = getProjectSetting().getTransitionSpecs(true);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new StateTransitionListPanel("transitions", transitions) {-- @Override- protected void onChanged(AjaxRequestTarget target) {- getProjectSetting().setTransitionSpecs(transitions);- OneDev.getInstance(ProjectManager.class).save(getProject());- }-- @Override- protected UseDefaultListener getUseDefaultListener() {- if (getProjectSetting().getTransitionSpecs(false) != null) {- return new UseDefaultListener() {-- @Override- public void onUseDefault() {- getProjectSetting().setTransitionSpecs(null);- OneDev.getInstance(ProjectManager.class).save(getProject());- setResponsePage(StateTransitionsPage.class, StateTransitionsPage.paramsOf(getProject()));- }-- };- } else {- return null;- }- }-- });- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.cssindex 71d0508f55..a4cc7634e7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css@@ -79,14 +79,21 @@ body.BranchProtectionsPage, body.TagProtectionsPage, body.WebHooksPage {#project-setting .avatar-edit form>button {margin-top: 20px;}-#project-setting .commit-message-transforms th {- font-weight: normal;-}#project-setting .authorization.list .select2-container,#project-setting .authorization.list .property-roleName .select2-container {width: 360px;}+#project-setting .web-hooks table thead th {+ font-weight: bold !important;+}+#project-setting .web-hooks table thead th.property-eventTypes {+ width: 25%;+}+#project-setting .web-hooks table .select2-container {+ width: 100%;+}+body.SecretListPage .help-block {margin: 0 0 16px 0;}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/ProjectWebHooksPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/ProjectWebHooksPage.htmldeleted file mode 100644index 62147d849a..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/ProjectWebHooksPage.html+++ /dev/null@@ -1,16 +0,0 @@-<wicket:extend>- <div class="page-title">Web Hooks</div>- <div class="help-block">- OneDev will post event data in JSON format to specified URLs when subscribed events happen- </div>- <div class="panel panel-default">- <div class="panel-heading"><b>Project Specific</b></div>- <div wicket:id="projectSpecificWebHooks" class="panel-body"></div>- </div>- <div class="panel panel-default">- <div class="panel-heading"><b>Inherited from <a wicket:id="owner">Owner</a></b></div>- <div class="panel-body">- <div wicket:id="inheritedWebHooks"></div>- </div>- </div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/ProjectWebHooksPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/ProjectWebHooksPage.javadeleted file mode 100644index fdcd2c10eb..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/ProjectWebHooksPage.java+++ /dev/null@@ -1,46 +0,0 @@-package io.onedev.server.web.page.project.setting.webhook;--import java.util.ArrayList;--import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.support.WebHook;-import io.onedev.server.web.component.link.SettingInOwnerLink;-import io.onedev.server.web.component.webhook.WebHookListPanel;-import io.onedev.server.web.component.webhook.WebHooksBean;-import io.onedev.server.web.editable.PropertyContext;-import io.onedev.server.web.page.admin.user.webhook.UserWebHooksPage;-import io.onedev.server.web.page.my.webhook.MyWebHooksPage;-import io.onedev.server.web.page.project.setting.ProjectSettingPage;--@SuppressWarnings("serial")-public class ProjectWebHooksPage extends ProjectSettingPage {-- public ProjectWebHooksPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- WebHooksBean bean = new WebHooksBean();- bean.setWebHooks(getProject().getWebHooks());- add(new WebHookListPanel("projectSpecificWebHooks", bean) {-- @Override- protected void onSaved(ArrayList<WebHook> webHooks) {- getProject().setWebHooks(webHooks);- OneDev.getInstance(ProjectManager.class).save(getProject());- setResponsePage(ProjectWebHooksPage.class, ProjectWebHooksPage.paramsOf(getProject()));- }-- });-- add(PropertyContext.view("inheritedWebHooks", getProject().getOwner(), "webHooks"));- add(new SettingInOwnerLink("owner", projectModel, UserWebHooksPage.class, MyWebHooksPage.class));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHooksBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksBean.javasimilarity index 89%rename from server-core/src/main/java/io/onedev/server/web/component/webhook/WebHooksBean.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksBean.javaindex 7e66eb5ab9..a7004d046e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/webhook/WebHooksBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.webhook;+package io.onedev.server.web.page.project.setting.webhook;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.htmlsimilarity index 52%rename from server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.htmlindex 5cf949df7f..41b8827b18 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/perservation/BuildPreservationListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html@@ -1,5 +1,9 @@-<wicket:panel>- <div class="build-preservation-list">+<wicket:extend>+ <div class="page-title">Web Hooks</div>+ <div class="help-block">+ OneDev will post event data in JSON format to specified URLs when subscribed events happen+ </div>+ <div class="web-hooks"><form wicket:id="form" class="leave-confirm"><div wicket:id="feedback"></div><div wicket:id="editor"></div>@@ -8,4 +12,4 @@</div></form></div>-</wicket:panel>\ No newline at end of file+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.javanew file mode 100644index 0000000000..640f9f53f7--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java@@ -0,0 +1,48 @@+package io.onedev.server.web.page.project.setting.webhook;++import java.io.Serializable;++import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.page.project.setting.ProjectSettingPage;++@SuppressWarnings("serial")+public class WebHooksPage extends ProjectSettingPage {++ public WebHooksPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ WebHooksBean bean = new WebHooksBean();+ bean.setWebHooks(getProject().getWebHooks());++ PropertyEditor<Serializable> editor = PropertyContext.edit("editor", bean, "webHooks");++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onSubmit() {+ super.onSubmit();+ getSession().success("Web hooks saved");+ getProject().setWebHooks(bean.getWebHooks());+ OneDev.getInstance(ProjectManager.class).save(getProject());+ setResponsePage(WebHooksPage.class, WebHooksPage.paramsOf(getProject()));+ }++ };+ form.add(new NotificationPanel("feedback", form));+ form.add(editor);+ add(form);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListCssResourceReference.javasimilarity index 87%rename from server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListCssResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListCssResourceReference.javaindex 050b37c1b8..d3e99f7740 100644--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListCssResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListCssResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.pullrequest;+package io.onedev.server.web.page.pullrequests;import org.apache.wicket.request.resource.CssResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.html b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.javasimilarity index 99%rename from server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.javarename to server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.javaindex 8686d20d26..72ba04499c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.pullrequest;+package io.onedev.server.web.page.pullrequests;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/pull-request-list.css b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/pull-request-list.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/pullrequest/pull-request-list.cssrename to server-core/src/main/java/io/onedev/server/web/page/pullrequests/pull-request-list.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/util/ConfirmOnClick.java b/server-core/src/main/java/io/onedev/server/web/util/ConfirmOnClick.javaindex 89340cc933..a69f3348d0 100644--- a/server-core/src/main/java/io/onedev/server/web/util/ConfirmOnClick.java+++ b/server-core/src/main/java/io/onedev/server/web/util/ConfirmOnClick.java@@ -7,7 +7,7 @@ import org.apache.wicket.AttributeModifier;public class ConfirmOnClick extends AttributeModifier {public ConfirmOnClick(String message) {- super("onclick", String.format("return confirm('%s');", StringEscapeUtils.escapeEcmaScript(message)));+ super("onclick", String.format("return !$(this).is('[disabled=disabled]') && confirm('%s');", StringEscapeUtils.escapeEcmaScript(message)));}}diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex f6eb494f99..0945f08514 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -148,7 +148,7 @@ public class SuggestionUtils {variables.put(VariableInterpolator.PREFIX_PARAMS + paramSpec.getName(), paramSpec.getDescription());for (Property property: buildSpec.getProperties())variables.put(VariableInterpolator.PREFIX_PROPERTIES + property.getName(), null);- for (JobSecret secret: project.getBuildSetting().getHierarchySecrets(project))+ for (JobSecret secret: project.getBuildSetting().getJobSecrets())variables.put(VariableInterpolator.PREFIX_SECRETS + secret.getName(), null);for (GroovyScript script: OneDev.getInstance(SettingManager.class).getGroovyScripts())variables.put(VariableInterpolator.PREFIX_SCRIPTS + script.getName(), null);