Skip to content

The Unified and Autonomous Development Platform

Minor bug fixes and UI improvements

Robin Shen8450cc2f7606
diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.java
index 827de2d3ac..ce31b5a1a2 100644
--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java
@@ -15,9 +15,9 @@ import io.onedev.server.persistence.dao.EntityManager;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.util.ValueSetEdit;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedStateResolution;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;
public interface IssueManager extends EntityManager<Issue> {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
index 80c33e1c0c..95ab0253f7 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
@@ -64,9 +64,9 @@ import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedStateResolution;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;
@Singleton
public class DefaultIssueManager extends AbstractEntityManager<Issue> implements IssueManager {
diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.java
index d1103a029d..f2bbd5e16e 100644
--- a/core/src/main/java/io/onedev/server/model/User.java
+++ b/core/src/main/java/io/onedev/server/model/User.java
@@ -11,6 +11,8 @@ import javax.persistence.Index;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Version;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationInfo;
@@ -18,6 +20,8 @@ import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.SimplePrincipalCollection;
import org.apache.shiro.subject.Subject;
import org.apache.shiro.web.mgt.WebSecurityManager;
+import org.apache.shiro.web.subject.WebSubject;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.eclipse.jgit.lib.PersonIdent;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -111,7 +115,13 @@ public class User extends AbstractEntity implements AuthenticationInfo {
public static Subject asSubject(Long userId) {
WebSecurityManager securityManager = AppLoader.getInstance(WebSecurityManager.class);
- return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();
+ if (RequestCycle.get() != null) {
+ ServletRequest request = (ServletRequest) RequestCycle.get().getRequest().getContainerRequest();
+ ServletResponse response = (ServletResponse) RequestCycle.get().getResponse().getContainerResponse();
+ return new WebSubject.Builder(securityManager, request, response).principals(asPrincipal(userId)).buildSubject();
+ } else {
+ return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();
+ }
}
@Editable(name="Login Name", order=100)
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
index e74cf352c1..562b342dbe 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
@@ -32,9 +32,9 @@ import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.IssueQuery;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedStateResolution;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;
@Editable
public class BoardSpec implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java
index b1dd55159e..4a0ac5bf68 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java
@@ -17,10 +17,10 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.util.ValueSetEdit;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution.FixType;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedStateResolution;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution.FixType;
public class IssueSetting implements Serializable {
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
index bd18eb7469..3d361376d4 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
@@ -35,9 +35,9 @@ import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Multiline;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution.FixType;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution.FixType;
import io.onedev.utils.StringUtils;
@Editable
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java
index b4d613cd74..7054f52f16 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java
@@ -16,7 +16,7 @@ import io.onedev.server.search.entity.AndCriteriaHelper;
import io.onedev.server.search.entity.ParensAware;
import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.ValueSetEdit;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
public class AndCriteria extends IssueCriteria implements ParensAware {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
index f7bd24a150..852d14c103 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
@@ -20,7 +20,7 @@ import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
public class ChoiceFieldCriteria extends FieldCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
index 6d4f1c99f6..1db7265e79 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
@@ -14,7 +14,7 @@ import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.ValueSetEdit;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
public abstract class IssueCriteria extends EntityCriteria<Issue> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index f430085fda..66689a5b7c 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -70,7 +70,7 @@ import io.onedev.server.util.inputspec.numberinput.NumberInput;
import io.onedev.server.util.inputspec.textinput.TextInput;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.util.WicketUtils;
public class IssueQuery extends EntityQuery<Issue> {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java
index 422ce8a8da..f174b9c3cb 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java
@@ -10,7 +10,7 @@ import io.onedev.server.model.User;
import io.onedev.server.search.entity.NotCriteriaHelper;
import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.ValueSetEdit;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
public class NotCriteria extends IssueCriteria {
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java
index b25633c4c4..90c5770a03 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java
@@ -16,7 +16,7 @@ import io.onedev.server.search.entity.OrCriteriaHelper;
import io.onedev.server.search.entity.ParensAware;
import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.ValueSetEdit;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
public class OrCriteria extends IssueCriteria implements ParensAware {
diff --git a/core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardBehavior.java
index b7493b8d9d..a4db2ce71b 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardBehavior.java
@@ -28,7 +28,7 @@ public class CopyClipboardBehavior extends Behavior {
public void renderHead(Component component, IHeaderResponse response) {
super.renderHead(component, response);
response.render(JavaScriptHeaderItem.forReference(new CopyClipboardResourceReference()));
- String script = String.format("onedev.server.copyclipboard.init('%s', '%s');",
+ String script = String.format("onedev.server.copyClipboard.onDomReady('%s', '%s');",
component.getMarkupId(true), JavaScriptEscape.escapeJavaScript(textModel.getObject()));
response.render(OnDomReadyHeaderItem.forScript(script));
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardResourceReference.java b/core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardResourceReference.java
index 182418a698..9f40602992 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardResourceReference.java
@@ -2,10 +2,12 @@ package io.onedev.server.web.behavior.clipboard;
import java.util.List;
+import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import io.onedev.server.web.asset.clipboard.ClipboardResourceReference;
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
public class CopyClipboardResourceReference extends BaseDependentResourceReference {
@@ -20,6 +22,8 @@ public class CopyClipboardResourceReference extends BaseDependentResourceReferen
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new ClipboardResourceReference()));
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ CopyClipboardResourceReference.class, "copy-clipboard.css")));
return dependencies;
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.css b/core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.css
new file mode 100644
index 0000000000..64e60f1ed7
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.css
@@ -0,0 +1,12 @@
+.copy-clipboard:not(.btn):not(.input-group-addon) {
+ color: #666;
+ position: relative;
+}
+.copy-clipboard:hover:not(.btn):not(.input-group-addon),
+.copy-clipboard:active:not(.btn):not(.input-group-addon) {
+ color: black;
+}
+.copy-clipboard:active:not(.btn):not(.input-group-addon) {
+ left: 1px;
+ top: 1px;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.js b/core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.js
index 28fb9653da..015df33c04 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.js
+++ b/core/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.js
@@ -1,19 +1,12 @@
-onedev.server.copyclipboard = {
- init: function(buttonId, text) {
+onedev.server.copyClipboard = {
+ onDomReady: function(buttonId, text) {
var $button = $("#" + buttonId);
var clipboard = new Clipboard("#"+buttonId, {
text: function(trigger) {
return text;
}
});
- $button.tooltip({animation: false, delay: 0, title: "Copy"});
- clipboard.on("success", function(e) {
- $button.tooltip("destroy");
- $button.tooltip({animation: false, delay: 0, title: "Copied"}).tooltip("show");
- $button.on("mouseout", function() {
- $button.tooltip("destroy").tooltip({title: "Copy", animation: false, delay: 0});
- $button.off("mouseout");
- });
- });
+ $button.attr("title", "Copy");
+ $button.addClass("copy-clipboard");
}
};
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css b/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
index d991b4a060..96c0a80c57 100644
--- a/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
@@ -15,9 +15,6 @@
.commit-list>div>ul .browse {
margin-left: 8px;
}
-.commit-list>div>ul a {
- color: #555;
-}
.commit-list>div>ul a.summary {
font-weight: bold;
font-size: 15px;
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
index 6eb6d46230..0ae6b51a57 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -24,9 +24,22 @@
</div>
</div>
<wicket:fragment wicket:id="summaryFrag">
- <span wicket:id="state" class="state"></span>
- <span wicket:id="number" class="number"></span>
- <a wicket:id="title" class="title"><span wicket:id="label"></span></a>
+ <div class="first-line">
+ <a wicket:id="title" class="title"><span wicket:id="label"></span></a>
+ <span wicket:id="number" class="number"></span>
+ </div>
+ <div class="second-line clearfix">
+ <span wicket:id="state" class="state pull-left"></span>
+ <div class="submission pull-left">
+ submitted by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>
+ </div>
+ <div class="pull-left votes" title="Votes">
+ <span class="fa fa-thumbs-o-up"></span> <span wicket:id="votes"></span>
+ </div>
+ <div class="pull-left comments" title="Comments">
+ <span class="fa fa-comments-o"></span> <span wicket:id="comments"></span>
+ </div>
+ </div>
</wicket:fragment>
<wicket:fragment wicket:id="listFieldsFrag">
<div class="issue-list-fields">
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 9002474f8c..96bfe8755c 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -52,7 +52,10 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.DateUtils;
import io.onedev.server.util.IssueField;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
@@ -63,6 +66,8 @@ import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.stringchoice.StringMultiChoice;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.savedquery.SavedQueriesClosed;
@@ -510,6 +515,13 @@ public abstract class IssueListPanel extends GenericPanel<String> {
fragment.add(link);
fragment.add(new IssueStateLabel("state", rowModel));
+ UserIdent submitterIdent = UserIdent.of(UserFacade.of(issue.getSubmitter()), issue.getSubmitterName());
+ fragment.add(new UserIdentPanel("submitter", submitterIdent, Mode.NAME));
+ fragment.add(new Label("submitDate", DateUtils.formatAge(issue.getSubmitDate())));
+
+ fragment.add(new Label("votes", issue.getVoteCount()));
+ fragment.add(new Label("comments", issue.getCommentCount()));
+
cellItem.add(fragment);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
index e12801470c..07aa0e7a72 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
@@ -27,16 +27,33 @@
.issue-list>.head>.others>*:last-child {
margin-right: 0;
}
-.issue-list>.body td.summary>div>* {
+.issue-list>.body td a {
+ color: #444;
+}
+.issue-list>.body td.summary .first-line {
+ margin-bottom: 8px;
+ font-size: 16px;
+ font-weight: bold;
+}
+.issue-list>.body td.summary .title {
margin-right: 8px;
}
-.issue-list>.body td.summary>div>*:last-child {
+.issue-list>.body td.summary .second-line>* {
+ margin-right: 12px;
+}
+.issue-list>.body td.summary .second-line>*:last-child {
margin-right: 0;
}
-.issue-list>.body td.summary .number {
- font-weight: bold;
+.issue-list>.body td.summary .state {
+ width: 120px;
+ padding: 6px 8px;
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+.issue-list>.body td.summary .second-line {
+ color: #888;
}
-.issue-list>.body td.submitter,
+
.issue-list>.body th.custom-field,
.issue-list>.body td.custom-field {
white-space: nowrap;
diff --git a/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css b/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css
index 61861a0d2c..ba74429918 100644
--- a/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css
+++ b/core/src/main/java/io/onedev/server/web/component/project/list/project-list.css
@@ -3,14 +3,12 @@
display: none;
}
}
-
-table.project-list {
- font-size: 13px;
+table.project-list td:not(.project) a {
+ color: #444;
}
-table.project-list td.project {
- font-size: 14px;
+table.project-list td.project img.project-avatar {
+ vertical-align: text-top;
}
-
table.project-list td.project, table.project-list td.author {
white-space: nowrap;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css b/core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css
index a56ab3e1d2..3f73e2f9f9 100644
--- a/core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css
+++ b/core/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css
@@ -1,3 +1,9 @@
+div.revision-selector ul.nav-tabs>li.collapsed {
+ display: none !important;
+}
+div.revision-selector ul.nav-tabs>li.expanded {
+ display: block !important;
+}
div.revision-selector input.revision {
margin-bottom: 12px;
background: url(search.gif) no-repeat right 6px center;
diff --git a/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.java b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.java
index e7a662431e..a396acf2cc 100644
--- a/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/TokenGeneratePanel.java
@@ -1,11 +1,13 @@
package io.onedev.server.web.component.user.tokengenerate;
+import org.apache.shiro.SecurityUtils;
import org.apache.shiro.codec.Base64;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.IFormSubmitter;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
@@ -35,6 +37,16 @@ public class TokenGeneratePanel extends GenericPanel<User> {
Form<?> form = new Form<Void>("form") {
+ @Override
+ public void process(IFormSubmitter submittingComponent) {
+ SecurityUtils.getSubject().runAs(getUser().getPrincipals());
+ try {
+ super.process(submittingComponent);
+ } finally {
+ SecurityUtils.getSubject().releaseRunAs();
+ }
+ }
+
@Override
protected void onSubmit() {
super.onSubmit();
diff --git a/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/token-generate.css b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/token-generate.css
index aa743a4dbe..d9d3343422 100644
--- a/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/token-generate.css
+++ b/core/src/main/java/io/onedev/server/web/component/user/tokengenerate/token-generate.css
@@ -2,6 +2,5 @@
margin-top: 20px;
}
.token-generate .token-value a {
- color: #444;
margin-left: 4px;
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.css
index 19bcaaee3c..ec421690fa 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -685,4 +685,3 @@ a.disabled, a[disabled="disabled"] {
.floating.side.def-detail .actions {
margin-bottom: 12px;
}
-
diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index a382edc354..370565cbd4 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -331,8 +331,9 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
@Override
protected void populateItem(ListItem<ProjectTab> item) {
- item.add(new ProjectTabLink("item", item.getModelObject()));
- if (item.getModelObject().isActive(getPage()))
+ ProjectTab tab = item.getModelObject();
+ item.add(tab.render("item"));
+ if (tab.isActive(getPage()))
item.add(AttributeAppender.append("class", "active"));
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css
index d61ea45da8..02fa19319b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css
@@ -10,6 +10,9 @@
padding: 6px 12px;
border-top: 1px solid #EEE;
}
+.folder-view>table>tbody>tr>td:not(.path) a {
+ color: #444;
+}
.folder-view>table>tbody>tr>td.path, .folder-view>table>tbody>tr>td.last-commit.author,
.folder-view>table>tbody>tr>td.last-commit.when {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
index 5380a46e9c..6bc7a08cf2 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html
@@ -15,15 +15,15 @@
<div wicket:id="refs" class="refs"></div>
<div class="contribution-and-parents clearfix">
<div class="contribution pull-left">
- <span wicket:id="contributorAvatars"></span>
- <span wicket:id="contribution"></span>
+ <span wicket:id="contributorAvatars" class="avatars"></span>
+ <span wicket:id="contribution" class="name"></span>
</div>
<div class="commit pull-left">
<span wicket:id="buildStatus" class="build-status"></span>
<span wicket:id="hash" class="hash"></span>
- <a wicket:id="copyHash"><i class="fa fa-clipboard"></i></a>
+ <a wicket:id="copyHash" class="copy"><i class="fa fa-clipboard"></i></a>
</div>
- <div wicket:id="parents" class="parents pull-right"></div>
+ <div wicket:id="parents" class="parents pull-left"></div>
</div>
</div>
<div wicket:id="revisionDiff"></div>
@@ -35,16 +35,16 @@
</wicket:fragment>
<wicket:fragment wicket:id="multiParentsFrag">
<div class="multiple">
- <label wicket:id="count"></label>
+ <span wicket:id="count"></span>
<div wicket:id="parents" class="parent btn-group">
- <a wicket:id="link" title="Show commit of this parent" class="commit btn btn-default btn-sm"><span wicket:id="label"></span></a>
- <a wicket:id="diff" title="Compare with this parent" class="diff btn btn-default btn-sm"><i class="fa fa-ext fa-file-diff"></i></a>
+ <a wicket:id="link" title="Show commit of this parent" class="commit btn btn-default btn-xs"><span wicket:id="label"></span></a>
+ <a wicket:id="diff" title="Compare with this parent" class="diff btn btn-default btn-xs"><i class="fa fa-ext fa-file-diff"></i></a>
</div>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="singleParentFrag">
<div class="single">
- <label>1 parent</label>
+ <span>1 parent</span>
<a wicket:id="parent" class="parent hash"><span wicket:id="label"></span></a>
</div>
</wicket:fragment>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
index 83d146d951..6e9247eb2c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
@@ -44,7 +44,7 @@
<div class="pull-right actions">
<span wicket:id="buildStatus"></span>
<span class="btn-group">
- <a wicket:id="hashLink" class="btn btn-default"><span wicket:id="hash"></span></a>
+ <a wicket:id="hashLink" class="btn btn-default hash"><span wicket:id="hash"></span></a>
<a wicket:id="copyHash" class="btn btn-default"><i class="fa fa-clipboard"></i></a>
</span>
<span class="btn-group">
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css b/core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
index 6a4ac6e385..c2ceee1512 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
@@ -12,7 +12,7 @@
#commit-detail>.info>.message {
background: #F9F9F9;
border-bottom: 1px dashed #E0E0E0;
- padding: 8px 12px;
+ padding: 8px 12px 0 12px;
border-radius: 4px 4px 0 0;
}
#commit-detail>.info>.message>.subject>.pull-left {
@@ -20,9 +20,11 @@
font-weight: bold;
padding-top: 2px;
color: #555;
+ margin-bottom: 8px;
}
#commit-detail>.info>.message>.subject>.pull-right {
margin-left: 8px;
+ margin-bottom: 8px;
}
#commit-detail>.info>.message>.subject .btn-group .fa {
color: #666;
@@ -58,31 +60,27 @@
color: #444;
}
#commit-detail>.info>.contribution-and-parents {
- padding: 12px;
-}
-#commit-detail>.info>.contribution-and-parents a {
- color: #444;
+ padding: 16px 12px 0 54px;
+ position: relative;
}
-#commit-detail>.info>.contribution-and-parents .contributor-avatars {
- margin-right: 4px;
+#commit-detail>.info>.contribution-and-parents>* {
+ margin-bottom: 16px;
+ margin-right: 20px;
}
-#commit-detail>.info>.contribution-and-parents div.commit {
- margin: 8px 20px 0 20px;
+#commit-detail>.info>.contribution-and-parents>*:last-child {
+ margin-right: 0;
}
-#commit-detail>.info>.contribution-and-parents .hash {
- color: #444;
+#commit-detail>.info>.contribution-and-parents .avatars {
+ position: absolute;
+ left: 12px;
+ top: 10px;
}
-#commit-detail>.info>.contribution-and-parents label {
- color: #666;
- font-weight: normal;
- margin-right: 8px;
+#commit-detail>.info>.contribution-and-parents .parents>div>* {
+ margin-right: 4px;
}
-#commit-detail>.info>.contribution-and-parents>.parents .single {
- margin-top: 7px;
+#commit-detail>.info>.contribution-and-parents .parents>div>*:last-child {
+ margin-right: 0;
}
-#commit-detail>.info>.contribution-and-parents>.parents .multiple {
- margin-top: 3px;
+#commit-detail>.info>.contribution-and-parents .parents .fa {
+ font-size: 12px;
}
-#commit-detail>.info>.contribution-and-parents .btn-group.parent {
- margin-right: 8px;
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css b/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css
index e54ac96fb2..a2bbf2fd08 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/project-commits.css
@@ -23,9 +23,6 @@
#project-commits>.main>.body .label {
margin: 3px 0 0 4px;
}
-#project-commits>.main>.body a {
- color: #555;
-}
#project-commits>.main>.body a.summary {
font-weight: bold;
font-size: 15px;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.html
index 6c2b9d8a71..3e51eab14b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.html
@@ -1,9 +1,6 @@
<wicket:extend>
<div id="issues">
- <wicket:enclosure child="reconcile">
- <div class="alert alert-warning">Issue workflow has been changed, please
- <a wicket:id="reconcile">reconcile</a> existing issues with the change</div>
- </wicket:enclosure>
+ <div wicket:id="workflowChangeAlert"></div>
<ul wicket:id="issuesTabs" class="nav nav-tabs"></ul>
<wicket:child></wicket:child>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
index 048206f899..35b24b7eec 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
@@ -6,23 +6,16 @@ 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.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.manager.SettingManager;
-import io.onedev.server.model.Project;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.tabbable.PageTab;
import io.onedev.server.web.component.tabbable.PageTabLink;
import io.onedev.server.web.component.tabbable.Tab;
@@ -34,7 +27,7 @@ import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;
import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;
-import io.onedev.server.web.page.project.issues.workflowreconcile.WorkflowReconcilePanel;
+import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowChangeAlertPanel;
@SuppressWarnings("serial")
public abstract class IssuesPage extends ProjectPage {
@@ -51,60 +44,14 @@ public abstract class IssuesPage extends ProjectPage {
protected void onInitialize() {
super.onInitialize();
- if (SecurityUtils.canAdministrate(getProject().getFacade())) {
- add(new ModalLink("reconcile") {
+ add(new WorkflowChangeAlertPanel("workflowChangeAlert") {
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new WorkflowReconcilePanel(id) {
-
- @Override
- protected Project getProject() {
- return IssuesPage.this.getProject();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected void onCompleted(AjaxRequestTarget target) {
- setResponsePage(IssuesPage.this);
- }
-
- };
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(!getGlobalIssueSetting().isReconciled());
- }
-
- @Override
- public IModel<?> getBody() {
- return Model.of("reconcile");
- }
-
- });
- } else {
- add(new Label("reconcile", "contact project administrator to reconcile") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("span");
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(!getGlobalIssueSetting().isReconciled());
- }
-
- });
- }
+ @Override
+ protected void onCompleted(AjaxRequestTarget target) {
+ setResponsePage(getPageClass(), getPageParameters());
+ }
+
+ });
List<Tab> tabs = new ArrayList<>();
tabs.add(new IssuesTab("Issue List", IssueListPage.class) {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html
index 58b3cce122..0142c2db84 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.html
@@ -1,4 +1,5 @@
<wicket:extend>
+ <div wicket:id="workflowChangeAlert"></div>
<div class="page-title">New Issue</div>
<div id="new-issue">
<form wicket:id="form" class="leave-confirm">
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index e403de4720..a2f0f73706 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.page.project.issues.create;
import java.util.List;
import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -22,6 +23,7 @@ import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.component.issue.create.NewIssueEditor;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
+import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowChangeAlertPanel;
import io.onedev.server.web.page.security.LoginPage;
@SuppressWarnings("serial")
@@ -64,6 +66,14 @@ public class NewIssuePage extends ProjectPage implements InputContext {
protected void onInitialize() {
super.onInitialize();
+ add(new WorkflowChangeAlertPanel("workflowChangeAlert") {
+
+ @Override
+ protected void onCompleted(AjaxRequestTarget target) {
+ setResponsePage(getPageClass(), getPageParameters());
+ }
+
+ });
NewIssueEditor editor = new NewIssueEditor("newIssue") {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
index 05570ec85a..eb55d232ab 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
@@ -1,6 +1,7 @@
<wicket:extend>
<div id="issue-detail">
<div class="main">
+ <div wicket:id="workflowChangeAlert"></div>
<div wicket:id="title"></div>
<div wicket:id="operations"></div>
<ul wicket:id="issueTabs" class="tabs nav nav-tabs"></ul>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index 7011a6d4dc..36b00993bb 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -47,6 +47,7 @@ import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.page.project.issues.list.IssueListPage;
+import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowChangeAlertPanel;
import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QueryPositionSupport;
@@ -87,6 +88,14 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
protected void onInitialize() {
super.onInitialize();
+ add(new WorkflowChangeAlertPanel("workflowChangeAlert") {
+
+ @Override
+ protected void onCompleted(AjaxRequestTarget target) {
+ setResponsePage(getPageClass(), getPageParameters());
+ }
+
+ });
add(new IssueTitlePanel("title") {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldResolution.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldResolution.java
rename to core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java
index ed3de8e18a..da63e1001b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldResolution.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.workflowreconcile;
+package io.onedev.server.web.page.project.issueworkflowreconcile;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldValue.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValue.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldValue.java
rename to core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValue.java
index d2802e9a05..9c9328322e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldValue.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValue.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.workflowreconcile;
+package io.onedev.server.web.page.project.issueworkflowreconcile;
import java.io.Serializable;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldValueResolution.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldValueResolution.java
rename to core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java
index 57351d10ff..01e4b356f8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldValueResolution.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.workflowreconcile;
+package io.onedev.server.web.page.project.issueworkflowreconcile;
import java.io.Serializable;
import java.util.ArrayList;
@@ -24,7 +24,7 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.ShowCondition;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.issues.workflowreconcile.WorkflowReconcilePanel.UndefinedFieldValueContainer;
+import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowReconcilePanel.UndefinedFieldValueContainer;
import io.onedev.server.web.util.ComponentContext;
import io.onedev.server.web.util.WicketUtils;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedStateResolution.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.java
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedStateResolution.java
rename to core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.java
index 96c1bfe841..f0b4b0d397 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedStateResolution.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.workflowreconcile;
+package io.onedev.server.web.page.project.issueworkflowreconcile;
import java.io.Serializable;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.html
new file mode 100644
index 0000000000..b5b1262bae
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.html
@@ -0,0 +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>
+</wicket:panel>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.java
new file mode 100644
index 0000000000..ea82fe5e4d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.java
@@ -0,0 +1,76 @@
+package io.onedev.server.web.page.project.issueworkflowreconcile;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+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.manager.SettingManager;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+
+@SuppressWarnings("serial")
+public abstract class WorkflowChangeAlertPanel extends Panel {
+
+ public WorkflowChangeAlertPanel(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ if (SecurityUtils.isAdministrator()) {
+ add(new ModalLink("reconcile") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new WorkflowReconcilePanel(id) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onCompleted(AjaxRequestTarget target) {
+ WorkflowChangeAlertPanel.this.onCompleted(target);
+ }
+
+ };
+ }
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of("reconcile");
+ }
+
+ });
+ } else {
+ add(new Label("reconcile", "contact site administrator to reconcile") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ });
+ }
+
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!OneDev.getInstance(SettingManager.class).getIssueSetting().isReconciled());
+ }
+
+ protected abstract void onCompleted(AjaxRequestTarget target);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.html b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.html
rename to core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java
similarity index 98%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.java
rename to core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java
index 4c8d17dc90..021ddf2fe2 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.workflowreconcile;
+package io.onedev.server.web.page.project.issueworkflowreconcile;
import java.util.Collection;
import java.util.HashMap;
@@ -25,11 +25,10 @@ import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.SettingManager;
-import io.onedev.server.model.Project;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValueResolution.FixType;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValueResolution.FixType;
import io.onedev.server.web.util.ajaxlistener.ChangeTextListener;
import io.onedev.server.web.util.ajaxlistener.DisableGlobalLoadingIndicatorListener;
import io.onedev.server.web.util.ajaxlistener.SelfDisableListener;
@@ -392,8 +391,6 @@ public abstract class WorkflowReconcilePanel extends Panel {
response.render(CssHeaderItem.forReference(new WorkflowReconcileResourceReference()));
}
- protected abstract Project getProject();
-
protected abstract void onCompleted(AjaxRequestTarget target);
protected abstract void onCancel(AjaxRequestTarget target);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcileResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcileResourceReference.java
similarity index 83%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcileResourceReference.java
rename to core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcileResourceReference.java
index 22b07aef44..92e6c9dfc5 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcileResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcileResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.issues.workflowreconcile;
+package io.onedev.server.web.page.project.issueworkflowreconcile;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/workflow-reconcile.css b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/workflow-reconcile.css
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/workflow-reconcile.css
rename to core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/workflow-reconcile.css
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html
index c51fc5ce7e..df0ed9f1b2 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html
@@ -25,9 +25,19 @@
</div>
</div>
<wicket:fragment wicket:id="summaryFrag">
- <span wicket:id="status" class="status"></span>
- <span wicket:id="number" class="number"></span>
- <a wicket:id="title" class="title"><span wicket:id="label"></span></a>
+ <div class="first-line">
+ <a wicket:id="title" class="title"><span wicket:id="label"></span></a>
+ <span wicket:id="number" class="number"></span>
+ </div>
+ <div class="second-line clearfix">
+ <div wicket:id="status" class="status pull-left"></div>
+ <div class="submission pull-left">
+ submitted by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>
+ </div>
+ <div class="comments pull-left" title="Comments">
+ <span class="fa fa-comments-o"></span> <span wicket:id="comments"></span>
+ </div>
+ </div>
</wicket:fragment>
<wicket:fragment wicket:id="sourceFrag">
<a wicket:id="link"></a>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
index 25cf9af451..fd7b786448 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
@@ -52,12 +52,16 @@ import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.PullRequestQueryBehavior;
import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel;
+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
@@ -371,6 +375,10 @@ public class PullRequestListPage extends ProjectPage {
link.add(new Label("label", request.getTitle()));
fragment.add(link);
fragment.add(new RequestStatusLabel("status", rowModel));
+ UserIdent submitterIdent = UserIdent.of(UserFacade.of(request.getSubmitter()), request.getSubmitterName());
+ fragment.add(new UserIdentPanel("submitter", submitterIdent, Mode.NAME));
+ fragment.add(new Label("submitDate", DateUtils.formatAge(request.getSubmitDate())));
+ fragment.add(new Label("comments", request.getCommentCount()));
cellItem.add(fragment);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css
index 01985068db..2f4dd1a13b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css
@@ -26,15 +26,31 @@
width: 4px;
padding: 0;
}
-#request-list>.main>.body td.summary>div>* {
+#request-list>.main>.body td a {
+ color: #444;
+}
+#request-list>.main>.body td.summary .first-line {
+ margin-bottom: 8px;
+ font-weight: bold;
+ font-size: 16px;
+}
+#request-list>.main>.body td.summary .title {
margin-right: 8px;
}
-#request-list>.main>.body td.summary>div>*:last-child {
+#request-list>.main>.body td.summary .second-line>* {
+ margin-right: 12px;
+}
+#request-list>.main>.body td.summary .second-line>*:last-child {
margin-right: 0;
}
-#request-list>.main>.body td.summary .number {
- font-weight: bold;
+#request-list>.main>.body td.summary .status {
+ width: 75px;
+ padding: 6px 8px;
+}
+#request-list>.main>.body td.summary .second-line {
+ color: #888;
}
+
#request-list>.main>.body tr.request.new td.new-indicator {
background: #4667EE;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
index 81df4ff7b3..e50c2500c7 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
@@ -154,7 +154,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
closed = "yes".equals(cookie.getValue());
} else {
LayoutPage page = (LayoutPage) getPage();
- closed = page.getClientProperties().getBrowserWidth() < WebConstants.NARROW_SCREEN;
+ closed = page.getClientProperties().getScreenWidth() < WebConstants.NARROW_SCREEN;
}
add(new AjaxLink<Void>("close") {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.html
index cec964b512..cd4a3e1cc9 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.html
@@ -1,6 +1,7 @@
<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>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java
index 5f19a9e1e9..2414bbdc2f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java
@@ -5,6 +5,7 @@ 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;
@@ -19,6 +20,7 @@ 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.issueworkflowreconcile.WorkflowChangeAlertPanel;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
@SuppressWarnings("serial")
@@ -32,6 +34,15 @@ public abstract class IssueSettingPage extends ProjectSettingPage {
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) {
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestResourceReference.java b/core/src/main/java/io/onedev/server/web/page/test/TestResourceReference.java
index 6d229e7423..af37c54a37 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestResourceReference.java
@@ -4,9 +4,7 @@ import java.util.List;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import io.onedev.server.web.asset.cropper.CropperResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -21,7 +19,6 @@ public class TestResourceReference extends BaseDependentResourceReference {
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(JavaScriptHeaderItem.forReference(new CropperResourceReference()));
dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
TestResourceReference.class, "test.css")));
return dependencies;
diff --git a/core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java b/core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java
index 1f72098efa..1ea9e83889 100644
--- a/core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java
+++ b/core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java
@@ -81,7 +81,6 @@ public class WebSocketProcessor extends AbstractWebSocketProcessor implements We
try {
Subject subject = (Subject) request.getHttpServletRequest().getAttribute(WebSocketFilter.SHIRO_SUBJECT);
ThreadContext.bind(subject);
-
runnable.run();
} finally {
ThreadContext.unbindSubject();