The Unified and Autonomous Development Platform
Make issue detail side bar fixed
Robin Shen3b2c83387d07
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex b27d8d3649..9f67f78c42 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -98,7 +98,7 @@ import io.onedev.utils.StringUtils;@Entity@Table(indexes={@Index(columnList="g_forkedFrom_id")})-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+//@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@DynamicUpdate@Editablepublic class Project extends AbstractEntity {diff --git a/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java b/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.javaindex cdb759a54b..e975b38db2 100644--- a/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java+++ b/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java@@ -82,7 +82,7 @@ public class DefaultDao implements Dao, Serializable {return findRange(entityCriteria, 0, Integer.MAX_VALUE);}- @Sessional+ @Transactional@Overridepublic <T extends AbstractEntity> T find(EntityCriteria<T> entityCriteria) {Criteria criteria = entityCriteria.getExecutableCriteria(getSession());@@ -102,7 +102,7 @@ public class DefaultDao implements Dao, Serializable {return new ManagedSerializedForm(Dao.class);}- @Sessional+ @Transactional@Overridepublic <T extends AbstractEntity> List<T> findAll(Class<T> entityClass) {return findRange(EntityCriteria.of(entityClass), 0, Integer.MAX_VALUE);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.htmlindex 20732d25a9..13b472d9e0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html@@ -32,6 +32,48 @@<a wicket:id="delete" class="delete btn btn-danger btn-sm"><i class="fa fa-trash"></i> Delete</a></div></wicket:enclosure>+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111+ <p>1111</div></div><wicket:fragment wicket:id="transitionFrag">diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex 233b6c42a0..6e557e931e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -20,6 +20,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;@@ -522,6 +523,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexpublic void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(CssHeaderItem.forReference(new IssueDetailResourceReference()));+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.issueDetail.onDomReady();"));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailResourceReference.javaindex 7579954e67..20833f1954 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailResourceReference.java@@ -1,6 +1,13 @@package io.onedev.server.web.page.project.issues.issuedetail;+import java.util.List;++import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;++import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;public class IssueDetailResourceReference extends BaseDependentCssResourceReference {@@ -10,4 +17,13 @@ public class IssueDetailResourceReference extends BaseDependentCssResourceReferesuper(IssueDetailResourceReference.class, "issue-detail.css");}+ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(JavaScriptHeaderItem.forReference(+ new BaseDependentResourceReference(IssueDetailResourceReference.class, "issue-detail.js")));+ dependencies.add(JavaScriptHeaderItem.forReference(new PerfectScrollbarResourceReference()));+ return dependencies;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.cssindex e8b6350699..4f498d2bd4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css@@ -1,16 +1,7 @@-#issue-detail {- display: table;- width: 100%;-}-#issue-detail>div {- display: table-cell;- vertical-align: top;-}#issue-detail>.main {- width: 75%;- padding-right: 20px;+ margin-right: 360px;+ pading-right: 20px;}-#issue-detail>.main>div {margin-bottom: 20px;}@@ -40,10 +31,14 @@}#issue-detail>.side {- border: 1px solid #E0E0E0;+ position: fixed;+ top: 48px;+ right: 0;+ bottom: 0;+ width: 360px;+ border-left: 2px solid #E0E0E0;padding: 20px;background: #F9F9F9;- border-radius: 4px;overflow: auto;}#issue-detail>.side>* {@@ -52,8 +47,8 @@padding-top: 20px;}#issue-detail>.side>div:first-child {- padding-top: 0;border-top: none;+ padding-top: 0;}#issue-detail>.side .fields td {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.js b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.jsnew file mode 100644index 0000000000..1e9017de9a--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.js@@ -0,0 +1,8 @@+onedev.server.issueDetail = {+ onDomReady: function() {+ var ps = new PerfectScrollbar($("#issue-detail>.side")[0]);+ $(window).resize(function() {+ ps.update();+ });+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex 3b5b1a4c3b..795b443f3a 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,4 +1,3 @@<wicket:extend><a wicket:id="test">test</a>- <div wicket:id="diffs"></div></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex 6726ea641a..ae0f6a2a70 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -1,12 +1,7 @@package io.onedev.server.web.page.test;-import java.util.List;-import org.apache.wicket.markup.html.link.Link;-import com.google.common.collect.Lists;--import io.onedev.server.web.component.diff.plain.PlainDiffPanel;import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -15,6 +10,7 @@ public class TestPage extends BasePage {@Overrideprotected void onInitialize() {super.onInitialize();+add(new Link<Void>("test") {@Override@@ -22,28 +18,6 @@ public class TestPage extends BasePage {}});-- List<String> oldLines = Lists.newArrayList(- "1",- "2",- "3",- "4",- "5",- "6",- "7",- "8 81 82 83 84 85",- "9");- List<String> newLines = Lists.newArrayList(- "1",- "2",- "3",- "4",- "5",- "6",- "7",- "80 81 82 83 84 85",- "9");- add(new PlainDiffPanel("diffs", oldLines, newLines));}}