Skip to content

The Unified and Autonomous Development Platform

Fix the issue that duplicated issues might be displayed in issue list page

robin shenb19d2e14bb46
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java
index ea43107437..4df7230d6c 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java
@@ -25,7 +25,7 @@ public class FieldUnaryCriteria extends FieldCriteria {
else if (operator == IssueQueryLexer.IsNotEmpty)
return context.getBuilder().isNotNull(attribute);
else if (operator == IssueQueryLexer.IsMe || operator == IssueQueryLexer.ContainsMe)
- return context.getBuilder().equal(attribute, SecurityUtils.getUser());
+ return context.getBuilder().equal(attribute, SecurityUtils.getUser().getName());
else
return context.getBuilder().notEqual(attribute, SecurityUtils.getUser());
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
index c5c3b123b8..865a56a3f4 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
@@ -11,6 +11,7 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Order;
+import javax.persistence.criteria.Path;
import javax.persistence.criteria.Root;
import org.antlr.v4.runtime.ANTLRInputStream;
@@ -102,9 +103,11 @@ public class IssueQuery implements Serializable {
}
}
+ Path<String> idPath = root.get("id");
if (orders.isEmpty())
- orders.add(builder.desc(root.get("id")));
+ orders.add(builder.desc(idPath));
query.orderBy(orders);
+ query.groupBy(idPath);
return query;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
index 5c9f535b90..6856e9fcdb 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html
@@ -1,9 +1,9 @@
<wicket:extend>
<div id="issue-list">
- <div class="head">
- <div class="primary clearfix">
- <div class="pull-left">
- <form wicket:id="query" class="query">
+ <div wicket:id="issueListHead" class="head">
+ <div class="query-and-actions">
+ <div class="query">
+ <form wicket:id="query">
<div class="input-group no-autofocus">
<input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order issues here"></input>
<span class="input-group-btn">
@@ -13,22 +13,26 @@
<div wicket:id="feedback"></div>
</form>
</div>
- <div class="pull-right">
+ <div class="actions">
+ <span class="btn-group">
+ <a wicket:id="save" class="btn btn-default" title="Save as preset query"><i class="fa fa-save"></i></a>
+ <a wicket:id="edit" class="btn btn-default" title="Edit preset queries"><i class="fa fa-pencil"></i></a>
+ <a wicket:id="fields" class="btn btn-default" title="Additional fields to display"><i class="fa fa-list-ul"></i></a>
+ </span>
<a wicket:id="newIssue" class="btn btn-success open-new"><i class="fa fa-plus"></i> Open New</a>
- <a wicket:id="fields" class="btn btn-default" title="Additional fields to display"><i class="fa fa-list-ul"></i></a>
</div>
</div>
- <div wicket:id="additional" class="additional">
- <span class="label label-info">Saved Queries</span>
+ <div wicket:id="presetQueries" class="preset-queries">
+ <span class="label label-warning">Preset Queries:</span>
<span class="btn-group user-queries">
- <wicket:container wicket:id="userQueries"><a wicket:id="link" class="btn btn-default btn-sm"><span wicket:id="label"></span></a></wicket:container>
+ <wicket:container wicket:id="userQueries">
+ <a wicket:id="link" class="btn btn-default btn-sm"><span wicket:id="label"></span></a>
+ </wicket:container>
</span>
<span class="btn-group project-queries">
- <wicket:container wicket:id="projectQueries"><a wicket:id="link" class="btn btn-default btn-sm"><span wicket:id="label"></span></a></wicket:container>
- </span>
- <span class="btn-group actions">
- <a wicket:id="save" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save</a>
- <a wicket:id="edit" class="btn btn-default btn-sm"><i class="fa fa-pencil"></i> Edit</a>
+ <wicket:container wicket:id="projectQueries">
+ <a wicket:id="link" class="btn btn-default btn-sm"><span wicket:id="label"></span></a>
+ </wicket:container>
</span>
</div>
</div>
@@ -84,7 +88,7 @@
<div class="modal-header">
<button wicket:id="close" type="button" class="close">&times;</button>
<h4 id="modal-title" class="modal-title">
- Save Query
+ Save as Preset Query
</h4>
</div>
<div class="modal-body">
@@ -134,6 +138,6 @@
</tr>
</tbody>
</table>
- <div wicket:id="noRecords" class="no-records">No saved queries</div>
+ <div wicket:id="noRecords" class="no-records">No preset queries</div>
</wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
index 66cfd22faa..f2ebdac565 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java
@@ -113,6 +113,10 @@ public class IssueListPage extends ProjectPage {
protected void onInitialize() {
super.onInitialize();
+ WebMarkupContainer head = new WebMarkupContainer("issueListHead");
+ head.setOutputMarkupId(true);
+ add(head);
+
TextField<String> input = new TextField<String>("input", new PropertyModel<String>(this, "query"));
input.add(new IssueQueryBehavior(projectModel));
@@ -136,112 +140,13 @@ public class IssueListPage extends ProjectPage {
};
form.add(input);
-
- form.setOutputMarkupId(true);
- add(form);
+ head.add(form);
form.add(new NotificationPanel("feedback", form));
- add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject())));
-
- add(new ModalLink("fields") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- Fragment fragment = new Fragment(id, "fieldsFrag", IssueListPage.this);
-
- IssueListCustomization customization = getCustomization();
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onError() {
- super.onError();
- RequestCycle.get().find(AjaxRequestTarget.class).add(this);
- }
-
- };
-
- PropertyDescriptor propertyDescriptor = new PropertyDescriptor(IssueListCustomization.class, "displayFields");
- IModel<List<String>> propertyModel = new IModel<List<String>>() {
-
- @Override
- public void detach() {
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public List<String> getObject() {
- return (List<String>) propertyDescriptor.getPropertyValue(customization);
- }
-
- @Override
- public void setObject(List<String> object) {
- propertyDescriptor.setPropertyValue(customization, object);
- }
-
- };
- form.add(new MultiChoiceEditor("editor", propertyDescriptor, propertyModel));
-
- form.add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
- }
-
- });
-
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- WebSession.get().setMetaData(CUSTOMIZATION_KEY, customization);
- setResponsePage(IssueListPage.this);
- }
-
- });
-
- form.add(new AjaxButton("saveAsDefault") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.canManage(getProject()));
- }
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- WebSession.get().setMetaData(CUSTOMIZATION_KEY, customization);
- getProject().setIssueListCustomization(customization);
- OneDev.getInstance(ProjectManager.class).save(getProject());
- setResponsePage(IssueListPage.this);
- }
-
- });
-
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
- }
-
- });
- form.setOutputMarkupId(true);
- fragment.add(form);
- return fragment;
- }
-
- });
-
- WebMarkupContainer additional = new WebMarkupContainer("additional");
- additional.setVisible(getLoginUser() != null || !getProject().getIssueListCustomization().getSavedQueries().isEmpty());
- additional.setOutputMarkupId(true);
- add(additional);
+ head.add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject())));
- additional.add(querySave = new ModalLink("save") {
+ head.add(querySave = new ModalLink("save") {
@Override
protected void onConfigure() {
@@ -280,7 +185,7 @@ public class IssueListPage extends ProjectPage {
super.onSubmit(target, form);
getLoginUser().getIssueQueries().put(bean.getName(), query);
OneDev.getInstance(UserManager.class).save(getLoginUser());
- target.add(additional);
+ target.add(head);
modal.close();
}
@@ -292,7 +197,7 @@ public class IssueListPage extends ProjectPage {
super.onSubmit(target, form);
getProject().getIssueListCustomization().getSavedQueries().put(bean.getName(), query);
OneDev.getInstance(ProjectManager.class).save(getProject());
- target.add(additional);
+ target.add(head);
modal.close();
}
@@ -326,7 +231,7 @@ public class IssueListPage extends ProjectPage {
}.setOutputMarkupId(true));
- additional.add(new ModalLink("edit") {
+ head.add(new ModalLink("edit") {
@Override
protected void onConfigure() {
@@ -452,7 +357,7 @@ public class IssueListPage extends ProjectPage {
OneDev.getInstance(ProjectManager.class).save(getProject());
}
modal.close();
- target.add(additional);
+ target.add(head);
}
});
@@ -477,17 +382,138 @@ public class IssueListPage extends ProjectPage {
}
});
- additional.add(new ListView<SavedQuery>("userQueries", new LoadableDetachableModel<List<SavedQuery>>() {
+
+ head.add(new ModalLink("fields") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ Fragment fragment = new Fragment(id, "fieldsFrag", IssueListPage.this);
+
+ IssueListCustomization customization = getCustomization();
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+
+ PropertyDescriptor propertyDescriptor = new PropertyDescriptor(IssueListCustomization.class, "displayFields");
+ IModel<List<String>> propertyModel = new IModel<List<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public List<String> getObject() {
+ return (List<String>) propertyDescriptor.getPropertyValue(customization);
+ }
+
+ @Override
+ public void setObject(List<String> object) {
+ propertyDescriptor.setPropertyValue(customization, object);
+ }
+
+ };
+ form.add(new MultiChoiceEditor("editor", propertyDescriptor, propertyModel));
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ });
+
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ WebSession.get().setMetaData(CUSTOMIZATION_KEY, customization);
+ setResponsePage(IssueListPage.this);
+ }
+
+ });
+
+ form.add(new AjaxButton("saveAsDefault") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canManage(getProject()));
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ WebSession.get().setMetaData(CUSTOMIZATION_KEY, customization);
+ getProject().setIssueListCustomization(customization);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ setResponsePage(IssueListPage.this);
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ });
+ form.setOutputMarkupId(true);
+ fragment.add(form);
+ return fragment;
+ }
+
+ });
+
+ IModel<List<SavedQuery>> userQueriesModel = new LoadableDetachableModel<List<SavedQuery>>() {
+
+ @Override
+ protected List<SavedQuery> load() {
+ List<SavedQuery> savedQueries = new ArrayList<>();
+ if (getLoginUser() != null) {
+ for (Map.Entry<String, String> entry: getLoginUser().getIssueQueries().entrySet())
+ savedQueries.add(new SavedQuery(entry.getKey(), entry.getValue()));
+ }
+ return savedQueries;
+ }
+
+ };
+
+ IModel<List<SavedQuery>> projectQueriesModel = new LoadableDetachableModel<List<SavedQuery>>() {
@Override
protected List<SavedQuery> load() {
List<SavedQuery> savedQueries = new ArrayList<>();
- for (Map.Entry<String, String> entry: getLoginUser().getIssueQueries().entrySet())
+ for (Map.Entry<String, String> entry: getProject().getIssueListCustomization().getSavedQueries().entrySet())
savedQueries.add(new SavedQuery(entry.getKey(), entry.getValue()));
return savedQueries;
}
- }) {
+ };
+
+ WebMarkupContainer presetQueries = new WebMarkupContainer("presetQueries") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!userQueriesModel.getObject().isEmpty()
+ || !projectQueriesModel.getObject().isEmpty());
+ }
+
+ };
+ head.add(presetQueries);
+
+ presetQueries.add(new ListView<SavedQuery>("userQueries", userQueriesModel) {
@Override
protected void populateItem(ListItem<SavedQuery> item) {
@@ -500,22 +526,12 @@ public class IssueListPage extends ProjectPage {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getLoginUser() != null);
+ setVisible(!getModelObject().isEmpty());
}
-
+
});
- additional.add(new ListView<SavedQuery>("projectQueries", new LoadableDetachableModel<List<SavedQuery>>() {
-
- @Override
- protected List<SavedQuery> load() {
- List<SavedQuery> savedQueries = new ArrayList<>();
- for (Map.Entry<String, String> entry: getProject().getIssueListCustomization().getSavedQueries().entrySet())
- savedQueries.add(new SavedQuery(entry.getKey(), entry.getValue()));
- return savedQueries;
- }
-
- }) {
+ presetQueries.add(new ListView<SavedQuery>("projectQueries", projectQueriesModel) {
@Override
protected void populateItem(ListItem<SavedQuery> item) {
@@ -525,6 +541,12 @@ public class IssueListPage extends ProjectPage {
item.add(link);
}
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getModelObject().isEmpty());
+ }
+
});
AtomicReference<IssueQuery> parsedQuery = new AtomicReference<>(null);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/SaveQueryBean.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/SaveQueryBean.java
index 785ec70dc7..0473e17e99 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/SaveQueryBean.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/SaveQueryBean.java
@@ -14,7 +14,7 @@ public class SaveQueryBean implements Serializable {
private String name;
- @Editable(description="Specify a name to identify the saved query")
+ @Editable(description="Specify a name to identify the preset query")
@NotEmpty
@OmitName
public String getName() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
index 3fea024837..5a5c4c6799 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css
@@ -1,14 +1,21 @@
#issue-list>.head {
margin-bottom: 20px;
}
-#issue-list>.head>.primary>.pull-left {
- width: 75%;
+#issue-list>.head>.query-and-actions {
+ position: relative;
+ margin-bottom: 10px;
}
-#issue-list>.head>.primary {
- margin-bottom: 20px;
+#issue-list>.head>.query-and-actions>.query {
+ margin-right: 260px;
}
-#issue-list>.head>.primary .open-new {
- margin-right: 8px;
+#issue-list>.head>.query-and-actions>.actions {
+ position: absolute;
+ right: 0;
+ top: 0;
+}
+#issue-list>.head>.query-and-actions>.actions>* {
+ margin-left: 8px;
+ margin-right: 0;
}
#issue-list>.head .alert {
margin-top: 20px;
@@ -17,17 +24,13 @@
#issue-list>.head .list-unstyled {
margin-bottom: 0;
}
-#issue-list>.head>.additional>* {
- margin-right: 8px;
-}
-#issue-list>.head>.additional .actions>a {
- margin-right: 0;
-}
-#issue-list>.head>.additional .label {
- font-size: 16px;
+#issue-list>.head>.preset-queries>.label {
+ font-size: 17px;
vertical-align: middle;
}
-
+#issue-list>.head>.preset-queries>* {
+ margin-right: 8px;
+}
#issue-list .issue {
border-bottom: 2px solid #DDD;
margin-bottom: 12px;