Skip to content

The Unified and Autonomous Development Platform

Minor UI improvements

Robin Shen4b6812d72ede
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/EmailAddressManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/EmailAddressManager.java
index 7ee2c32fd6..9f66fdd907 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/EmailAddressManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/EmailAddressManager.java
@@ -7,7 +7,7 @@ import org.eclipse.jgit.lib.PersonIdent;
import io.onedev.server.model.EmailAddress;
import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.EntityManager;
-import io.onedev.server.util.facade.EmailAddressFacades;
+import io.onedev.server.util.facade.EmailAddressCache;
public interface EmailAddressManager extends EntityManager<EmailAddress> {
@@ -29,5 +29,5 @@ public interface EmailAddressManager extends EntityManager<EmailAddress> {
void sendVerificationEmail(EmailAddress emailAddress);
- EmailAddressFacades cloneCache();
+ EmailAddressCache cloneCache();
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
index 4f793bfd28..16e28de2b3 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
@@ -30,7 +30,7 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.facade.EmailAddressFacade;
-import io.onedev.server.util.facade.EmailAddressFacades;
+import io.onedev.server.util.facade.EmailAddressCache;
@Singleton
public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress> implements EmailAddressManager {
@@ -43,7 +43,7 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
private final SessionManager sessionManager;
- private final EmailAddressFacades cache = new EmailAddressFacades();
+ private final EmailAddressCache cache = new EmailAddressCache();
private final ReadWriteLock cacheLock = new ReentrantReadWriteLock();
@@ -287,7 +287,7 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
}
@Override
- public EmailAddressFacades cloneCache() {
+ public EmailAddressCache cloneCache() {
return cache.clone();
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java
index 63235f10c1..e60c42d0fd 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java
@@ -49,7 +49,7 @@ public class DefaultLinkSpecManager extends BaseEntityManager<LinkSpec> implemen
String oppositeName = link.getOpposite()!=null?link.getOpposite().getName():null;
if (oppositeName != null)
ids.put(oppositeName, link.getId());
- cache.put(link.getId(), new LinkSpecFacade(link.getId(), link.getName(), oppositeName));
+ cache.put(link.getId(), link.getFacade());
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
index f2c592897b..43ca3add5d 100644
--- a/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
+++ b/server-core/src/main/java/io/onedev/server/model/AbstractEntity.java
@@ -18,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import io.onedev.server.model.support.EntityWatch;
import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.util.facade.EntityFacade;
@MappedSuperclass
@JsonIgnoreProperties("handler")
@@ -33,7 +34,7 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstrac
public static final String PROP_NUMBER = "number";
- private transient Object customData;
+ private transient EntityFacade oldVersion;
@Api(order=1)
@Id
@@ -112,12 +113,13 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstrac
}
}
- public Object getCustomData() {
- return customData;
+ @Nullable
+ public EntityFacade getOldVersion() {
+ return oldVersion;
}
- public void setCustomData(Object customData) {
- this.customData = customData;
+ public void setOldVersion(@Nullable EntityFacade oldVersion) {
+ this.oldVersion = oldVersion;
}
public boolean isNew() {
@@ -142,4 +144,9 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstrac
}
}
+ @Nullable
+ public EntityFacade getFacade() {
+ return null;
+ }
+
}
\ No newline at end of file
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.java
index 1b598d9277..15e832c36d 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
@@ -727,6 +727,7 @@ public class Build extends AbstractEntity implements Referenceable, AttachmentSt
return commitsCache.get(sincePrevStatus);
}
+ @Override
public BuildFacade getFacade() {
return new BuildFacade(getId(), getProject().getId(), getNumber(), getCommitHash());
}
diff --git a/server-core/src/main/java/io/onedev/server/model/EmailAddress.java b/server-core/src/main/java/io/onedev/server/model/EmailAddress.java
index 86a2c72bdc..decf87eeb8 100644
--- a/server-core/src/main/java/io/onedev/server/model/EmailAddress.java
+++ b/server-core/src/main/java/io/onedev/server/model/EmailAddress.java
@@ -95,6 +95,7 @@ public class EmailAddress extends AbstractEntity {
return getVerificationCode() == null;
}
+ @Override
public EmailAddressFacade getFacade() {
return new EmailAddressFacade(getId(), getValue(), isPrimary(), isGit(),
getVerificationCode(), getOwner().getId());
diff --git a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
index 4000522f60..23af5121a3 100644
--- a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
@@ -18,6 +18,7 @@ import io.onedev.server.model.support.issue.LinkSpecOpposite;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
import io.onedev.server.search.entity.issue.IssueQueryUpdater;
+import io.onedev.server.util.facade.LinkSpecFacade;
import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.editable.annotation.Editable;
@@ -163,4 +164,9 @@ public class LinkSpec extends AbstractEntity {
return updaters;
}
+ @Override
+ public LinkSpecFacade getFacade() {
+ return new LinkSpecFacade(getId(), getName(), getOpposite()!=null?getOpposite().getName():null);
+ }
+
}
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.java
index e93960766c..ca44642b3c 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
@@ -266,6 +266,7 @@ public class Project extends AbstractEntity {
@Column(nullable=false)
private String name;
+ @JsonIgnore
@Column(nullable=false)
private String path;
@@ -712,6 +713,7 @@ public class Project extends AbstractEntity {
return blobCache;
}
+ @Override
public ProjectFacade getFacade() {
return new ProjectFacade(getId(), getName(), getPath(), getServiceDeskName(),
isIssueManagement(), Role.idOf(getDefaultRole()), Project.idOf(getParent()));
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.java
index ed7f7d8ea4..df2837defe 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
@@ -869,6 +869,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {
return gitEmailAddress.orElse(null);
}
+ @Override
public UserFacade getFacade() {
return new UserFacade(getId(), getName(), getFullName(), getAccessToken());
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/GroupResource.java b/server-core/src/main/java/io/onedev/server/rest/GroupResource.java
index 401833b1ac..26ed47dff2 100644
--- a/server-core/src/main/java/io/onedev/server/rest/GroupResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/GroupResource.java
@@ -30,6 +30,7 @@ import io.onedev.server.rest.annotation.Api;
import io.onedev.server.rest.exception.InvalidParamException;
import io.onedev.server.rest.support.RestConstants;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.facade.GroupFacade;
@Api(order=6000)
@Path("/groups")
@@ -95,7 +96,7 @@ public class GroupResource {
public Long createOrUpdate(@NotNull Group group) {
if (!SecurityUtils.isAdministrator())
throw new UnauthorizedException();
- groupManager.save(group, (String) group.getCustomData());
+ groupManager.save(group, ((GroupFacade) group.getOldVersion()).getName());
return group.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
index 8fd90c86b8..80cbc42f66 100644
--- a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
@@ -54,6 +54,7 @@ import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Day;
+import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.web.page.project.setting.ContributedProjectSetting;
@Api(order=1000)
@@ -105,6 +106,17 @@ public class ProjectResource {
return cloneUrl;
}
+ @Api(order=150)
+ @Path("/{projectId}/path")
+ @GET
+ public String getPath(@PathParam("projectId") Long projectId) {
+ Project project = projectManager.load(projectId);
+ if (!SecurityUtils.canAccess(project))
+ throw new UnauthorizedException();
+
+ return project.getPath();
+ }
+
@Api(order=200)
@Path("/{projectId}/setting")
@GET
@@ -241,9 +253,9 @@ public class ProjectResource {
@POST
public Long createOrUpdate(@NotNull Project project) {
Project parent = project.getParent();
- Long prevParentId = (Long) project.getCustomData();
+ Long oldParentId = ((ProjectFacade) project.getOldVersion()).getParentId();
- if (project.isNew() || !Objects.equals(prevParentId, Project.idOf(parent))) {
+ if (project.isNew() || !Objects.equals(oldParentId, Project.idOf(parent))) {
if (parent != null && !SecurityUtils.canCreateChildren(parent))
throw new UnauthorizedException("Not authorized to create project under '" + parent.getPath() + "'");
if (parent == null && !SecurityUtils.canCreateRootProjects())
diff --git a/server-core/src/main/java/io/onedev/server/rest/RoleResource.java b/server-core/src/main/java/io/onedev/server/rest/RoleResource.java
index 2d8d3330a7..10f72b5040 100644
--- a/server-core/src/main/java/io/onedev/server/rest/RoleResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/RoleResource.java
@@ -28,6 +28,7 @@ import io.onedev.server.rest.annotation.Api;
import io.onedev.server.rest.exception.InvalidParamException;
import io.onedev.server.rest.support.RestConstants;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.facade.RoleFacade;
@Api(order=7000)
@Path("/roles")
@@ -75,7 +76,7 @@ public class RoleResource {
public Long createOrUpdate(@NotNull Role role) {
if (!SecurityUtils.isAdministrator())
throw new UnauthorizedException();
- roleManager.save(role, new ArrayList<>(), (String) role.getCustomData());
+ roleManager.save(role, new ArrayList<>(), ((RoleFacade) role.getOldVersion()).getName());
return role.getId();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/UserResource.java
index a7edfb6680..416b78c592 100644
--- a/server-core/src/main/java/io/onedev/server/rest/UserResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/UserResource.java
@@ -324,9 +324,10 @@ public class UserResource {
if (existingUser != null && !existingUser.equals(user))
throw new ExplicitException("Login name is already used by another user");
+ String oldName = user.getName();
user.setName(data.getName());
user.setFullName(data.getFullName());
- userManager.save(user);
+ userManager.save(user, oldName);
return user.getId();
} else {
throw new UnauthenticatedException();
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacades.java b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacades.java
rename to server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java
index 12bdc61884..706de9f984 100644
--- a/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressFacades.java
+++ b/server-core/src/main/java/io/onedev/server/util/facade/EmailAddressCache.java
@@ -9,13 +9,13 @@ import org.eclipse.jgit.lib.PersonIdent;
import io.onedev.server.model.User;
-public class EmailAddressFacades extends HashMap<Long, EmailAddressFacade> {
+public class EmailAddressCache extends HashMap<Long, EmailAddressFacade> {
private static final long serialVersionUID = 1L;
@Override
- public EmailAddressFacades clone() {
- EmailAddressFacades clone = new EmailAddressFacades();
+ public EmailAddressCache clone() {
+ EmailAddressCache clone = new EmailAddressCache();
clone.putAll(this);
return clone;
}
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/GroupFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/GroupFacade.java
new file mode 100644
index 0000000000..a6d989419b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/facade/GroupFacade.java
@@ -0,0 +1,18 @@
+package io.onedev.server.util.facade;
+
+public class GroupFacade extends EntityFacade {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String name;
+
+ public GroupFacade(Long id, String name) {
+ super(id);
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/RoleFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/RoleFacade.java
new file mode 100644
index 0000000000..2d156d5523
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/facade/RoleFacade.java
@@ -0,0 +1,18 @@
+package io.onedev.server.util.facade;
+
+public class RoleFacade extends EntityFacade {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String name;
+
+ public RoleFacade(Long id, String name) {
+ super(id);
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java
index a64800094c..f602351ca2 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java
@@ -15,10 +15,6 @@ import com.fasterxml.jackson.databind.deser.impl.PropertyValue;
import com.google.common.base.Preconditions;
import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.Group;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.Role;
-import io.onedev.server.model.User;
import io.onedev.server.persistence.dao.Dao;
@SuppressWarnings("serial")
@@ -57,17 +53,7 @@ public class EntityDeserializer extends BeanDeserializer {
if (property.getName().equals("id") && value != null) {
jp.nextToken();
AbstractEntity entity = dao.load(entityClass, (Long)value);
- if (entity instanceof Project) {
- Project project = (Project) entity;
- if (project.getParent() != null)
- entity.setCustomData(project.getParent().getId());
- } else if (entity instanceof User) {
- entity.setCustomData(((User) entity).getName());
- } else if (entity instanceof Group) {
- entity.setCustomData(((Group) entity).getName());
- } else if (entity instanceof Role) {
- entity.setCustomData(((Role) entity).getName());
- }
+ entity.setOldVersion(entity.getFacade());
Object bean;
if (entity instanceof HibernateProxy)
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js b/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js
index 177aa2f18a..711d686877 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/align/jquery.align.js
@@ -30,10 +30,13 @@
$this.css("position", "absolute");
}
+ var thisOldWidth = $this.outerWidth();
+ var thisOldHeight = $this.outerHeight();
+
var $autosuit = $this.find(".autosuit:visible:not(:has('.autosuit:visible'))");
if ($autosuit.length == 0)
$autosuit = $this;
-
+
var scrollTop = $autosuit.scrollTop();
var scrollLeft = $autosuit.scrollLeft();
@@ -51,6 +54,13 @@
var thisWidth = $this.outerWidth();
var thisHeight = $this.outerHeight();
+ // Do not reduce original dimension as otherwise the popup may flip while filtering its content
+ // and this will make the typing experience bad
+ if (thisWidth < thisOldWidth)
+ thisWidth = thisOldWidth;
+ if (thisHeight < thisOldHeight)
+ thisHeight = thisOldHeight;
+
var width = thisWidth;
var height = thisHeight;
@@ -203,16 +213,11 @@
$this.css({left:left-$parent.offset().left, top:top-$parent.offset().top});
- if (height < thisHeight)
- $autosuit.outerHeight($autosuit.outerHeight()+height-thisHeight);
- $autosuit.outerHeight($autosuit.outerHeight()+2);
-
- if (width < thisWidth)
- $autosuit.outerWidth($autosuit.outerWidth()+width-thisWidth);
+ $autosuit.outerWidth($autosuit.outerWidth()+width-thisWidth);
+ $autosuit.outerHeight($autosuit.outerHeight()+height-thisHeight);
+ $this.outerWidth(width);
+ $this.outerHeight(height);
- if ($autosuit.height() < $autosuit[0].scrollHeight)
- $autosuit.outerWidth($autosuit.outerWidth()+scrollbarWidth);
-
$autosuit.scrollTop(scrollTop);
$autosuit.scrollLeft(scrollLeft);
});
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css
index e8be9c3770..cb530f5c2a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/step.css
@@ -3,3 +3,4 @@
width: 600px;
}
}
+
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html
index 3d7847ab08..ecb683c944 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/fieldspec/IssueFieldListPage.html
@@ -2,7 +2,9 @@
<div class="issue-fields">
<div class="text-muted mb-4">
<wicket:svg href="bulb" class="icon"/> Define all custom issue fields here. Each project can
- decide to use all or a subset of these fields via its issue transition setting.
+ decide to use all or a subset of these fields via its issue transition setting.
+ <b class="text-warning">NOTE: </b> Newly defined fields by default only appear in new issues.
+ Batch edit existing issues from issue list page if you want them to have these new fields
</div>
<a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add custom field"><wicket:svg href="plus" class="icon"></wicket:svg></a>
<table wicket:id="issueFields" class="table table-hover"></table>