The Unified and Autonomous Development Platform
"Ssh not enabled" exception moved from SshKeysListPanel to ssh pages
Andrea Del Bene824eea47f71d
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.javaindex 02458178ba..b9d40b2a0c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/ssh/SshSettingPage.java@@ -5,8 +5,10 @@ import java.util.HashSet;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.SshSettings;+import io.onedev.server.web.OneWebApplication;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;@@ -24,6 +26,11 @@ public class SshSettingPage extends AdministrationPage {protected void onInitialize() {super.onInitialize();+ if (!OneWebApplication.get().isSshEnabled()) {+ throw new OneException("This page requires Ssh support to be enabled. "+ + " You need to specify ssh_port parameter in server.properties");+ }+SshSettings sshSetting = OneDev.getInstance(SettingManager.class).getSshSettings();Form<?> form = new Form<Void>("form") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.javaindex 89e6b161f8..7448caceaf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/MySshKeysPage.java@@ -7,9 +7,11 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;+import io.onedev.server.OneException;import io.onedev.server.entitymanager.SshKeyManager;import io.onedev.server.model.SshKey;import io.onedev.server.model.User;+import io.onedev.server.web.OneWebApplication;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.page.my.MyPage;@@ -27,6 +29,11 @@ public class MySshKeysPage extends MyPage {protected void onInitialize() {super.onInitialize();+ if (!OneWebApplication.get().isSshEnabled()) {+ throw new OneException("This page requires Ssh support to be enabled. "+ + " You need to specify ssh_port parameter in server.properties");+ }+User user = getLoginUser();LoadableDetachableModel<List<SshKey>> detachableModel = new LoadableDetachableModel<List<SshKey>>() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.javaindex 59a2cad2c1..d7e63f90cd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/sshkeys/SshKeysListPanel.java@@ -2,7 +2,6 @@ package io.onedev.server.web.page.my.sshkeys;import java.time.format.DateTimeFormatter;import java.util.List;-import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -11,12 +10,9 @@ import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.IModel;-import io.onedev.server.OneDev;-import io.onedev.server.OneException;import io.onedev.server.model.SshKey;import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.web.OneWebApplication;import io.onedev.server.web.component.modal.confirm.ConfirmModal;@SuppressWarnings("serial")@@ -27,11 +23,6 @@ public class SshKeysListPanel extends Panel {public SshKeysListPanel(String id, IModel<List<SshKey>> model) {super(id);- if (!OneWebApplication.get().isSshEnabled()) {- throw new OneException("This page requires Ssh support to be enabled. "- + " You need to specify ssh_port parameter in server.properties");- }-WebMarkupContainer keyList = new WebMarkupContainer("keyList");keyList.add(new ListView<SshKey>("keys", model)