Skip to content

The Unified and Autonomous Development Platform

Fix issue #547 - Issue imports should require issue management permission

Robin Shen87fbe0e1eda4
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 755ac95978..6921b2d9e7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -366,7 +366,12 @@ public abstract class IssueListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getPage() instanceof ProjectIssueListPage);
+ if (getPage() instanceof ProjectIssueListPage) {
+ ProjectIssueListPage page = (ProjectIssueListPage) getPage();
+ setVisible(SecurityUtils.canManageIssues(page.getProject()));
+ } else {
+ setVisible(false);
+ }
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java
index cf1eaa68dc..c2ceed4b3e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java
@@ -2,6 +2,8 @@ package io.onedev.server.web.component.menu;
import java.util.List;
+import javax.annotation.Nullable;
+
import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.CssHeaderItem;
@@ -44,6 +46,11 @@ public abstract class MenuLink extends DropdownLink {
protected List<MenuItem> getMenuItems() {
return MenuLink.this.getMenuItems(dropdown);
}
+
+ @Override
+ protected String getHelp() {
+ return MenuLink.this.getHelp();
+ }
};
}
@@ -55,4 +62,10 @@ public abstract class MenuLink extends DropdownLink {
}
protected abstract List<MenuItem> getMenuItems(FloatingPanel dropdown);
+
+ @Nullable
+ protected String getHelp() {
+ return null;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.html b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.html
index 09349e1e84..6732d73782 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.html
@@ -2,6 +2,7 @@
<ul class="list-unstyled">
<li wicket:id="items"><wicket:container wicket:id="content"></wicket:container></li>
</ul>
+ <div wicket:id="help" class="help alert alert-light-info mt-2 mb-0 mx-3"></div>
<wicket:fragment wicket:id="contentFrag">
<a wicket:id="link" class="text-nowrap d-flex align-items-center"><svg wicket:id="tick" class="icon-tick icon mr-2 ml-n2"/><svg wicket:id="icon" class="icon mr-3"/><span wicket:id="label" class="text"/><span wicket:id="shortcut" class="shortcut ml-auto text-right"/></a>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java
index b13ac8f68c..f559291e6e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java
@@ -3,6 +3,8 @@ package io.onedev.server.web.component.menu;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
+import javax.annotation.Nullable;
+
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -88,8 +90,19 @@ abstract class MenuPanel extends Panel {
}
});
+
+ String help = getHelp();
+ if (help != null)
+ add(new Label("help", help));
+ else
+ add(new WebMarkupContainer("help").setVisible(false));
}
protected abstract List<MenuItem> getMenuItems();
+ @Nullable
+ protected String getHelp() {
+ return null;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index a2533a2b36..5fbed5133e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -878,6 +878,14 @@ public class ProjectListPanel extends Panel {
super.onConfigure();
setVisible(SecurityUtils.getUser() != null);
}
+
+ @Override
+ protected String getHelp() {
+ if (!SecurityUtils.isAdministrator())
+ return "Permission will be checked upon actual operation";
+ else
+ return null;
+ }
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 4591b0024e..9b130cb972 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -314,7 +314,6 @@ public abstract class LayoutPage extends BasePage {
@Override
public void onClick() {
toggleDarkMode();
- setResponsePage(getPageClass(), getPageParameters());
}
@Override