ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/AD-368-harmonize-functionality-of-ascrib' into AD-496-add-control-buttons-to-fineupload

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-06-29 17:37:51 +02:00
commit f1d3b3968f
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/components/ascribe_uploader/react_s3_fine_uploader.js
View File

@ -25,7 +25,8 @@ var ReactS3FineUploader = React.createClass({
bitcoinId: React.PropTypes.string bitcoinId: React.PropTypes.string
}), }),
createBlobRoutine: React.PropTypes.shape({ createBlobRoutine: React.PropTypes.shape({
url: React.PropTypes.string url: React.PropTypes.string,
bitcoinId: React.PropTypes.string
}), }),
submitKey: React.PropTypes.func, submitKey: React.PropTypes.func,
autoUpload: React.PropTypes.bool, autoUpload: React.PropTypes.bool,
@ -264,7 +265,8 @@ var ReactS3FineUploader = React.createClass({
credentials: 'include', credentials: 'include',
body: JSON.stringify({ body: JSON.stringify({
'filename': file.name, 'filename': file.name,
'key': file.key 'key': file.key,
'bitcoin_id': this.props.createBlobRoutine.bitcoinId
}) })
}) })
.then((res) => { .then((res) => {

8
js/components/edition.js
View File

@ -520,7 +520,8 @@ let FileUploader = React.createClass({
bitcoinId: this.props.edition.bitcoin_id bitcoinId: this.props.edition.bitcoin_id
}} }}
createBlobRoutine={{ createBlobRoutine={{
url: apiUrls.blob_otherdatas url: apiUrls.blob_otherdatas,
bitcoinId: this.props.edition.bitcoin_id
}} }}
validation={{ validation={{
itemLimit: 100000, itemLimit: 100000,
@ -532,7 +533,10 @@ let FileUploader = React.createClass({
session={{ session={{
endpoint: AppConstants.serverUrl + 'api/blob/otherdatas/fineuploader_session/', endpoint: AppConstants.serverUrl + 'api/blob/otherdatas/fineuploader_session/',
customHeaders: { customHeaders: {
'X-CSRFToken': getCookie('csrftoken') 'X-CSRFToken': getCookie('csrftoken')
},
params: {
'pk': this.props.edition.other_data.id
} }
}}/> }}/>
); );