The Unified and Autonomous Development Platform
Fix the issue that file upload/image paste does not work
Robin Shenb3a00ee752a7
diff --git a/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownBehavior.java b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownBehavior.javaindex 1af334a388..d44044ebff 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownBehavior.java+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/MarkdownBehavior.java@@ -22,7 +22,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.request.IRequestParameters;-import org.apache.wicket.request.Url;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.apache.wicket.request.resource.PackageResourceReference;@@ -188,12 +187,10 @@ public class MarkdownBehavior extends AbstractPostAjaxBehavior {} else {encodedAttachmentSupport = "undefined";}- String uploadUrl = RequestCycle.get().getUrlRenderer().renderRelativeUrl(Url.parse("attachment_upload"));- String script = String.format("gitplex.server.markdown.init('%s', %s, %s, '%s', %s, %d);",+ String script = String.format("gitplex.server.markdown.init('%s', %s, %s, %s, %d);",component.getMarkupId(true),ATWHO_LIMIT,getCallbackFunction(explicit("type"), explicit("param"), explicit("param2")),- uploadUrl,encodedAttachmentSupport,attachmentSupport!=null?attachmentSupport.getAttachmentMaxSize():0);response.render(OnDomReadyHeaderItem.forScript(script));diff --git a/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.jsindex b2dccf58ff..23de510cd6 100644--- a/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.js+++ b/web/src/main/java/com/gitplex/server/web/behavior/markdown/markdown.js@@ -1,5 +1,5 @@gitplex.server.markdown = {- init: function(inputId, atWhoLimit, callback, uploadUrl, attachmentSupport, attachmentMaxSize) {+ init: function(inputId, atWhoLimit, callback, attachmentSupport, attachmentMaxSize) {var $input = $("#" + inputId);function onSelectUrl(isImage) {var $modal = $("" +@@ -220,7 +220,7 @@ gitplex.server.markdown = {gitplex.server.markdown.updateUploadMessage($input,"!!Unable to connect to server!!", xhr.replaceMessage);};- xhr.open("POST", uploadUrl, true);+ xhr.open("POST", "/attachment_upload", true);xhr.setRequestHeader("File-Name", encodeURIComponent(file.name));xhr.setRequestHeader("Attachment-Support", attachmentSupport);xhr.send(file);diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.javaindex 2e1b35d7c4..3e9e0694cd 100644--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java@@ -127,6 +127,8 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {public DepotBlobPage(final PageParameters params) {super(params);+ System.out.println(RequestCycle.get().getRequest().getUrl());+if (getDepot().getDefaultBranch() == null)throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));diff --git a/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java b/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.javaindex d0b7e833dd..ed5ba45039 100644--- a/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java+++ b/web/src/main/java/com/gitplex/server/web/util/avatar/DefaultAvatarManager.java@@ -12,7 +12,6 @@ import javax.inject.Singleton;import org.apache.commons.codec.binary.Hex;import org.apache.wicket.markup.html.form.upload.FileUpload;-import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.lib.PersonIdent;import com.gitplex.launcher.bootstrap.Bootstrap;@@ -44,11 +43,11 @@ public class DefaultAvatarManager implements AvatarManager {@Overridepublic String getAvatarUrl(Account account) {if (account == null)- return renderRelativeUrl(AVATARS_BASE_URL + "default.png");+ return AVATARS_BASE_URL + "default.png";File avatarFile = getUploaded(account);if (avatarFile.exists()) {- return renderRelativeUrl(AVATARS_BASE_URL + "uploaded/" + account.getId() + "?version=" + avatarFile.lastModified());+ return AVATARS_BASE_URL + "uploaded/" + account.getId() + "?version=" + avatarFile.lastModified();}if (configManager.getSystemSetting().isGravatarEnabled() && !account.isOrganization())@@ -81,11 +80,7 @@ public class DefaultAvatarManager implements AvatarManager {}}- return renderRelativeUrl(AVATARS_BASE_URL + "generated/" +encoded);- }-- private String renderRelativeUrl(String url) {- return RequestCycle.get().getUrlRenderer().renderContextRelativeUrl(url);+ return AVATARS_BASE_URL + "generated/" + encoded;}@Override