ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-06-28 08:37:59 +02:00
Code Issues Releases Wiki Activity

PR Feedback: add getLangText and move itemLimit and sizeLimit to app constants

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-09-16 15:14:08 +02:00
parent b2a3c9545b
commit 7c376b7229
6 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/components/ascribe_detail/further_details_fileuploader.js
View File

@ -55,10 +55,7 @@ let FurtherDetailsFileuploader = React.createClass({
url: ApiUrls.blob_otherdatas, url: ApiUrls.blob_otherdatas,
pieceId: this.props.pieceId pieceId: this.props.pieceId
}} }}
validation={{ validation={AppConstants.fineUploader.validation.additionalData}
itemLimit: 100000,
sizeLimit: '50000000'
}}
submitFile={this.props.submitFile} submitFile={this.props.submitFile}
setIsUploadReady={this.props.setIsUploadReady} setIsUploadReady={this.props.setIsUploadReady}
isReadyForFormSubmission={this.props.isReadyForFormSubmission} isReadyForFormSubmission={this.props.isReadyForFormSubmission}

5
js/components/ascribe_forms/form_create_contract.js
View File

@ -78,13 +78,12 @@ let CreateContractForm = React.createClass({
url: ApiUrls.blob_contracts url: ApiUrls.blob_contracts
}} }}
validation={{ validation={{
itemLimit: 100000, itemLimit: AppConstants.fineUploader.validation.additionalData.itemLimit,
sizeLimit: '50000000', sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit,
allowedExtensions: ['pdf'] allowedExtensions: ['pdf']
}} }}
areAssetsDownloadable={true} areAssetsDownloadable={true}
areAssetsEditable={true} areAssetsEditable={true}
submitFile={this.submitFile}
setIsUploadReady={this.setIsUploadReady} setIsUploadReady={this.setIsUploadReady}
isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile} isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}
fileClassToUpload={this.props.fileClassToUpload}/> fileClassToUpload={this.props.fileClassToUpload}/>

5
js/components/ascribe_forms/form_register_piece.js
View File

@ -107,10 +107,7 @@ let RegisterPieceForm = React.createClass({
createBlobRoutine={{ createBlobRoutine={{
url: ApiUrls.blob_digitalworks url: ApiUrls.blob_digitalworks
}} }}
validation={{ validation={AppConstants.fineUploader.validation.registerWork}
itemLimit: 100000,
sizeLimit: '25000000000'
}}
setIsUploadReady={this.setIsUploadReady} setIsUploadReady={this.setIsUploadReady}
isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile} isReadyForFormSubmission={formSubmissionValidation.atLeastOneUploadedFile}
isFineUploaderActive={this.props.isFineUploaderActive} isFineUploaderActive={this.props.isFineUploaderActive}

12
js/components/ascribe_settings/contract_settings.js
View File

@ -101,12 +101,12 @@ let ContractSettings = React.createClass({
className="btn btn-default btn-sm margin-left-2px" className="btn btn-default btn-sm margin-left-2px"
href={contract.blob.url_safe} href={contract.blob.url_safe}
target="_blank"> target="_blank">
PREVIEW {getLangText('PREVIEW')}
</a> </a>
<button <button
className="btn btn-default btn-sm margin-left-2px" className="btn btn-default btn-sm margin-left-2px"
onClick={this.removeContract(contract)}> onClick={this.removeContract(contract)}>
REMOVE {getLangText('REMOVE')}
</button> </button>
</div> </div>
} }
@ -122,8 +122,8 @@ let ContractSettings = React.createClass({
<CreateContractForm <CreateContractForm
isPublic={false} isPublic={false}
fileClassToUpload={{ fileClassToUpload={{
singular: 'new private contract', singular: getLangText('new private contract'),
plural: 'new private contracts' plural: getLangText('new private contracts')
}}/> }}/>
{privateContracts.map((contract, i) => { {privateContracts.map((contract, i) => {
return ( return (
@ -138,12 +138,12 @@ let ContractSettings = React.createClass({
className="btn btn-default btn-sm margin-left-2px" className="btn btn-default btn-sm margin-left-2px"
href={contract.blob.url_safe} href={contract.blob.url_safe}
target="_blank"> target="_blank">
PREVIEW {getLangText('PREVIEW')}
</a> </a>
<button <button
className="btn btn-default btn-sm margin-left-2px" className="btn btn-default btn-sm margin-left-2px"
onClick={this.removeContract(contract)}> onClick={this.removeContract(contract)}>
REMOVE {getLangText('REMOVE')}
</button> </button>
</div> </div>
} }

4
js/components/ascribe_settings/contract_settings_update_button.js
View File

@ -65,8 +65,8 @@ let ContractSettingsUpdateButton = React.createClass({
url: ApiUrls.blob_contracts url: ApiUrls.blob_contracts
}} }}
validation={{ validation={{
itemLimit: 100000, itemLimit: AppConstants.fineUploader.validation.registerWork.itemLimit,
sizeLimit: '50000000', sizeLimit: AppConstants.fineUploader.validation.additionalData.sizeLimit,
allowedExtensions: ['pdf'] allowedExtensions: ['pdf']
}} }}
setIsUploadReady={() =>{/* So that ReactS3FineUploader is not complaining */}} setIsUploadReady={() =>{/* So that ReactS3FineUploader is not complaining */}}

13
js/constants/application_constants.js
View File

@ -57,6 +57,19 @@ let constants = {
// Source: http://www.w3schools.com/tags/att_input_type.asp // Source: http://www.w3schools.com/tags/att_input_type.asp
'possibleInputTypes': ['button', 'checkbox', 'color', 'date', 'datetime', 'datetime-local', 'email', 'file', 'hidden', 'image', 'month', 'number', 'password', 'radio', 'range', 'reset', 'search', 'submit', 'tel', 'text', 'time', 'url', 'week'], 'possibleInputTypes': ['button', 'checkbox', 'color', 'date', 'datetime', 'datetime-local', 'email', 'file', 'hidden', 'image', 'month', 'number', 'password', 'radio', 'range', 'reset', 'search', 'submit', 'tel', 'text', 'time', 'url', 'week'],
'fineUploader': {
'validation': {
'additionalData': {
'itemLimit': 100,
'sizeLimit': '50000000'
},
'registerWork': {
'itemLimit': 1,
'sizeLimit': '25000000000'
}
}
},
// in case of whitelabel customization, we store stuff here // in case of whitelabel customization, we store stuff here
'whitelabel': {}, 'whitelabel': {},
'raven': { 'raven': {