Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for reply to user avatar and picture uploading not working when editing post with discourse running in a prefix

This commit is contained in:
Wojciech Kocjan 2013-04-05 12:46:14 +02:00
parent 5273657537
commit 0481fbae8c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/utilities.js
View File

@ -53,7 +53,7 @@ Discourse.Utilities = {
if (template) { if (template) {
return template.replace(/\{size\}/g, rawSize); return template.replace(/\{size\}/g, rawSize);
} }
return "/users/" + (username.toLowerCase()) + "/avatar/" + rawSize + "?__ws=" + (encodeURIComponent(Discourse.BaseUrl || "")); return Discourse.getURL("/users/") + (username.toLowerCase()) + "/avatar/" + rawSize + "?__ws=" + (encodeURIComponent(Discourse.BaseUrl || ""));
}, },
avatarImg: function(options) { avatarImg: function(options) {

2
app/assets/javascripts/discourse/views/composer_view.js
View File

@ -270,7 +270,7 @@ Discourse.ComposerView = Discourse.View.extend({
$uploadTarget.off(); $uploadTarget.off();
$uploadTarget.fileupload({ $uploadTarget.fileupload({
url: '/uploads', url: Discourse.getURL('/uploads'),
dataType: 'json', dataType: 'json',
timeout: 20000, timeout: 20000,
formData: { topic_id: 1234 } formData: { topic_id: 1234 }

2
app/models/upload.rb
View File

@ -48,7 +48,7 @@ class Upload < ActiveRecord::Base
File.open("#{path}/#{clean_name}", "wb") do |f| File.open("#{path}/#{clean_name}", "wb") do |f|
f.write File.read(file.tempfile) f.write File.read(file.tempfile)
end end
upload.url = "#{url_root}/#{clean_name}" upload.url = Discourse::base_uri + "#{url_root}/#{clean_name}"
upload.save upload.save
upload upload