1
0
mirror of https://github.com/ascribe/onion.git synced 2025-01-03 18:35:09 +01:00

Merge remote-tracking branch 'remotes/origin/AD-551-work-on-burn-down-list' into AD-419-decouple-piece-registration-from-

Conflicts:
	js/components/ascribe_detail/edition.js
This commit is contained in:
diminator 2015-07-09 14:59:24 +01:00
parent bf0a36f2a3
commit 9aa81433a6

View File

@ -331,157 +331,6 @@ let EditionPublicEditionNote = React.createClass({
}
});
//let EditionFurtherDetails = React.createClass({
// propTypes: {
// edition: React.PropTypes.object,
// handleSuccess: React.PropTypes.func
// },
//
// getInitialState() {
// return {
// loading: false
// };
// },
//
// showNotification(){
// this.props.handleSuccess();
// let notification = new GlobalNotificationModel('Details updated', 'success');
// GlobalNotificationActions.appendGlobalNotification(notification);
// },
//
// submitKey(key){
// this.setState({
// otherDataKey: key
// });
// },
//
// setIsUploadReady(isReady) {
// this.setState({
// isUploadReady: isReady
// });
// },
//
// isReadyForFormSubmission(files) {
// files = files.filter((file) => file.status !== 'deleted' && file.status !== 'canceled');
// if(files.length > 0 && files[0].status === 'upload successful') {
// return true;
// } else {
// return false;
// }
// },
//
// render() {
// let editable = this.props.edition.acl.indexOf('edit') > -1;
//
// return (
// <Row>
// <Col md={12} className="ascribe-edition-personal-note">
// <PieceExtraDataForm
// name='artist_contact_info'
// title='Artist Contact Info'
// handleSuccess={this.showNotification}
// editable={editable}
// content={this.props.edition} />
// <PieceExtraDataForm
// name='display_instructions'
// title='Display Instructions'
// handleSuccess={this.showNotification}
// editable={editable}
// content={this.props.edition} />
// <PieceExtraDataForm
// name='technology_details'
// title='Technology Details'
// handleSuccess={this.showNotification}
// editable={editable}
// content={this.props.edition} />
// <FileUploader
// submitKey={this.submitKey}
// setIsUploadReady={this.setIsUploadReady}
// isReadyForFormSubmission={this.isReadyForFormSubmission}
// editable={editable}
// content={this.props.edition}/>
// </Col>
// </Row>
// );
// }
//});
//
//let FileUploader = React.createClass({
// propTypes: {
// edition: React.PropTypes.object,
// setIsUploadReady: React.PropTypes.func,
// submitKey: React.PropTypes.func,
// isReadyForFormSubmission: React.PropTypes.func,
// editable: React.PropTypes.bool
// },
//
// render() {
// // Essentially there a three cases important to the fileuploader
// //
// // 1. there is no other_data => do not show the fileuploader at all
// // 2. there is other_data, but user has no edit rights => show fileuploader but without action buttons
// // 3. both other_data and editable are defined or true => show fileuploade with all action buttons
// if (!this.props.editable && !this.props.edition.other_data){
// return null;
// }
// return (
// <Form>
// <Property
// label="Additional files">
// <ReactS3FineUploader
// keyRoutine={{
// url: AppConstants.serverUrl + 's3/key/',
// fileClass: 'otherdata',
// bitcoinId: this.props.edition.bitcoin_id
// }}
// createBlobRoutine={{
// url: apiUrls.blob_otherdatas,
// bitcoinId: this.props.edition.bitcoin_id
// }}
// validation={{
// itemLimit: 100000,
// sizeLimit: '10000000'
// }}
// submitKey={this.props.submitKey}
// setIsUploadReady={this.props.setIsUploadReady}
// isReadyForFormSubmission={this.props.isReadyForFormSubmission}
// session={{
// endpoint: AppConstants.serverUrl + 'api/blob/otherdatas/fineuploader_session/',
// customHeaders: {
// 'X-CSRFToken': getCookie('csrftoken')
// },
// params: {
// 'pk': this.props.edition.other_data ? this.props.edition.other_data.id : null
// },
// cors: {
// expected: true,
// sendCredentials: true
// }
// }}
// signature={{
// endpoint: AppConstants.serverUrl + 's3/signature/',
// customHeaders: {
// 'X-CSRFToken': getCookie('csrftoken')
// }
// }}
// deleteFile={{
// enabled: true,
// method: 'DELETE',
// endpoint: AppConstants.serverUrl + 's3/delete',
// customHeaders: {
// 'X-CSRFToken': getCookie('csrftoken')
// }
// }}
// areAssetsDownloadable={true}
// areAssetsEditable={this.props.editable}/>
// </Property>
// <hr />
// </Form>
// );
// }
//});
let CoaDetails = React.createClass({
propTypes: {
edition: React.PropTypes.object