IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #679 from mattermost/fix-file-content-type

Browse Source 
Blank Content-Type for file GETs.
This commit is contained in:
Harrison Healey
2015-09-14 16:17:22 -04:00
parent 312f7d7656 0654b0c06b
commit c447db6e78
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/file.go
View File

@@ -349,6 +349,7 @@ func getFile(c *Context, w http.ResponseWriter, r *http.Request) {
w.Header().Set("Cache-Control", "max-age=2592000, public")
w.Header().Set("Content-Length", strconv.Itoa(len(f)))
w.Header().Set("Content-Type", "") // need to provide proper Content-Type in the future
w.Write(f)
}

7
web/react/components/file_upload.jsx
View File

@@ -20,12 +20,11 @@ export default class FileUpload extends React.Component {
}
fileUploadSuccess(channelId, data) {
var parsedData = $.parseJSON(data);
this.props.onFileUpload(parsedData.filenames, parsedData.client_ids, channelId);
this.props.onFileUpload(data.filenames, data.client_ids, channelId);
var requests = this.state.requests;
for (var j = 0; j < parsedData.client_ids.length; j++) {
delete requests[parsedData.client_ids[j]];
for (var j = 0; j < data.client_ids.length; j++) {
delete requests[data.client_ids[j]];
}
this.setState({requests: requests});
}