The Unified and Autonomous Development Platform
Some bug fixes
Robin Shen339e577a3898
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.cssindex 0e94929498..be833e84c7 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css+++ b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.css@@ -9,7 +9,7 @@ body.fullscreen {left: 0;top: 0;width: 100%;- z-index: 1000;+ z-index: 1060;padding: 20px;background: white;}diff --git a/core/src/main/java/io/onedev/server/web/component/modal/modal.js b/core/src/main/java/io/onedev/server/web/component/modal/modal.jsindex d4db85816d..3de700f637 100644--- a/core/src/main/java/io/onedev/server/web/component/modal/modal.js+++ b/core/src/main/java/io/onedev/server/web/component/modal/modal.js@@ -9,7 +9,8 @@ onedev.server.modal = {&& $("body>.floating").length == 0&& $(".sp-container:visible").length == 0&& $(".atwho-view:visible").length == 0- && $modal.nextAll(".modal").length == 0) {+ && $modal.nextAll(".modal").length == 0+ && !$("body").hasClass("fullscreen")) {if ($modal.find(".leave-confirm.dirty").length != 0) {if (confirm("There are unsaved changes, do you want to close?")) {onedev.server.modal.close($modal, true);diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java b/core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.javaindex 5d641ed1f9..76bd29ed0a 100644--- a/core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/ActionTab.java@@ -42,9 +42,6 @@ public abstract class ActionTab extends Tab {each.setSelected(false);setSelected(true);-- tabLink.findParent(Tabbable.class).renderOptions(this);-onSelect(tabLink);}diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java b/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.javaindex af35ac23a2..b69f092d93 100644--- a/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java@@ -89,11 +89,4 @@ public class Tabbable extends Panel {super.onBeforeRender();}- public void renderOptions(Tab tab) {- Component options = tab.renderOptions(OPTIONS_ID);- if (options != null)- replace(options);- else- replace(new WebMarkupContainer(OPTIONS_ID).setVisible(false));- }}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 3f5b720769..8d061b3e08 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -63,6 +63,8 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte@SuppressWarnings("unused")private String buildQuery;+ private IssueActivitiesPanel activities;+public CardDetailPanel(String id, IModel<Issue> model) {super(id, model);}@@ -75,15 +77,17 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputContereturn getIssue().getProject();}- private Component newActivitiesPanel() {- return new IssueActivitiesPanel(TAB_CONTENT_ID) {+ private IssueActivitiesPanel newActivitiesPanel() {+ IssueActivitiesPanel activities = new IssueActivitiesPanel(TAB_CONTENT_ID) {@Overrideprotected Issue getIssue() {return CardDetailPanel.this.getIssue();}- }.setOutputMarkupId(true);+ };+ activities.setOutputMarkupId(true);+ return activities;}@Override@@ -121,9 +125,14 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = newActivitiesPanel();- CardDetailPanel.this.replace(content);- target.add(content);+ activities = newActivitiesPanel();+ CardDetailPanel.this.replace(activities);+ target.add(activities);+ }++ @Override+ protected Component renderOptions(String componentId) {+ return activities.renderOptions(componentId);}});@@ -258,7 +267,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte}});- addOrReplace(newActivitiesPanel());+ addOrReplace(activities = newActivitiesPanel());super.onBeforeRender();}