The Unified and Autonomous Development Platform
Do not tell wicket to gather browser info to avoid repeated requests in some cases
Robin Shenccbd47e6223b
diff --git a/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java b/server-core/src/main/java/io/onedev/server/web/OneWebApplication.javaindex 3f30c515fa..48d4b194d2 100644--- a/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java+++ b/server-core/src/main/java/io/onedev/server/web/OneWebApplication.java@@ -83,7 +83,6 @@ public class OneWebApplication extends WebApplication {protected void init() {super.init();- getRequestCycleSettings().setGatherExtendedBrowserInfo(true);getMarkupSettings().setDefaultMarkupEncoding("UTF-8");getMarkupSettings().setStripComments(true);getMarkupSettings().setStripWicketTags(true);diff --git a/server-core/src/main/java/io/onedev/server/web/WebConstants.java b/server-core/src/main/java/io/onedev/server/web/WebConstants.javaindex 5a729cfeff..f9df35faaf 100644--- a/server-core/src/main/java/io/onedev/server/web/WebConstants.java+++ b/server-core/src/main/java/io/onedev/server/web/WebConstants.java@@ -14,6 +14,4 @@ public class WebConstants {/* commit constants */public static final int MAX_DISPLAY_COMMITS = 500;- public static final int NARROW_SCREEN = 768;-}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.javaindex 4c879ea705..fdfecc8e58 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@@ -15,8 +15,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.ExternalLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.repeater.RepeatingView;-import org.apache.wicket.protocol.http.ClientProperties;-import org.apache.wicket.protocol.http.request.WebClientInfo;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.launcher.loader.AppLoader;@@ -62,11 +60,8 @@ import io.onedev.server.web.page.security.RegisterPage;@SuppressWarnings("serial")public abstract class LayoutPage extends BasePage {- private final ClientProperties clientProperties;-public LayoutPage(PageParameters params) {super(params);- clientProperties = ((WebClientInfo)getSession().getClientInfo()).getProperties();}@Override@@ -238,8 +233,4 @@ public abstract class LayoutPage extends BasePage {return new WebMarkupContainer(componentId);}- public ClientProperties getClientProperties() {- return clientProperties;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.javaindex 8cd115b682..9f57233472 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java@@ -38,7 +38,6 @@ import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.watch.WatchStatus;-import io.onedev.server.web.WebConstants;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.component.modal.ModalLink;@@ -49,7 +48,6 @@ import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.watchstatus.WatchStatusLink;import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.page.layout.LayoutPage;import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")@@ -150,12 +148,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {WebRequest request = (WebRequest) RequestCycle.get().getRequest();Cookie cookie = request.getCookie(getCookieName());- if (cookie != null) {- closed = "yes".equals(cookie.getValue());- } else {- LayoutPage page = (LayoutPage) getPage();- closed = page.getClientProperties().getScreenWidth() < WebConstants.NARROW_SCREEN;- }+ closed = cookie == null || "yes".equals(cookie.getValue());add(new AjaxLink<Void>("close") {