haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-05 00:43:53 +00:00
Code Issues Releases Wiki Activity

Expire validate repair (#3566)

Browse Source 
* repair validate bug

* change limit state checkbox state to disabled

* modify limit share message style
This commit is contained in:
杨顺强
2019-05-29 10:43:30 +08:00
committed by Daniel Pan
parent f466261715
commit 9df8ee0d6e
1 changed files with 39 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
frontend/src/components/dialog/generate-share-link.js
View File

@@ -143,7 +143,7 @@ class GenerateShareLink extends React.Component {
password: '', password: '',
passwordnew: '', passwordnew: '',
isShowPasswordInput: false, isShowPasswordInput: false,
expireDays: '', expireDays: shareLinkExpireDaysDefault,
isExpireChecked: false, isExpireChecked: false,
errorInfo: '', errorInfo: '',
sharedLinkInfo: null, sharedLinkInfo: null,
@@ -192,8 +192,7 @@ class GenerateShareLink extends React.Component {
this.setState({errorInfo: 'Please enter days'}); this.setState({errorInfo: 'Please enter days'});
return false; return false;
} }
let flag = reg.test(expireDays); if (!reg.test(expireDays)) {
if (!flag) {
this.setState({errorInfo: 'Please enter a non-negative integer'}); this.setState({errorInfo: 'Please enter a non-negative integer'});
return false; return false;
} }
@@ -204,8 +203,7 @@ class GenerateShareLink extends React.Component {
this.setState({errorInfo: 'Please enter days'}); this.setState({errorInfo: 'Please enter days'});
return false; return false;
} }
let flag = reg.test(expireDays); if (!reg.test(expireDays)) {
if (!flag) {
this.setState({errorInfo: 'Please enter a non-negative integer'}); this.setState({errorInfo: 'Please enter a non-negative integer'});
return false; return false;
} }
@@ -229,7 +227,7 @@ class GenerateShareLink extends React.Component {
} }
if (minDays !== 0 && maxDays !== 0) { if (minDays !== 0 && maxDays !== 0) {
if (expireDays < minDays || expireDays < maxDays) { if (expireDays < minDays || expireDays > maxDays) {
this.setState({errorInfo: 'Please enter valid days'}); this.setState({errorInfo: 'Please enter valid days'});
return false; return false;
} }
@@ -382,7 +380,6 @@ class GenerateShareLink extends React.Component {
</FormGroup> </FormGroup>
{this.state.isShowPasswordInput && {this.state.isShowPasswordInput &&
<FormGroup className="link-operation-content" check> <FormGroup className="link-operation-content" check>
{/* todo translate */}
<Label className="font-weight-bold">{gettext('Password')}</Label>{' '}<span className="tip">{passwordLengthTip}</span> <Label className="font-weight-bold">{gettext('Password')}</Label>{' '}<span className="tip">{passwordLengthTip}</span>
<InputGroup className="passwd"> <InputGroup className="passwd">
<Input type={this.state.isPasswordVisible ? 'text' : 'password'} value={this.state.password || ''} onChange={this.inputPassword}/> <Input type={this.state.isPasswordVisible ? 'text' : 'password'} value={this.state.password || ''} onChange={this.inputPassword}/>
@@ -396,35 +393,43 @@ class GenerateShareLink extends React.Component {
</FormGroup> </FormGroup>
} }
{this.isExpireDaysNoLimit && ( {this.isExpireDaysNoLimit && (
<FormGroup check> <Fragment>
<Label check> <FormGroup check>
<Input className="expire-checkbox" type="checkbox" onChange={this.onExpireChecked}/>{' '}{gettext('Add auto expiration')} <Label check>
</Label> <Input className="expire-checkbox" type="checkbox" onChange={this.onExpireChecked}/>{' '}{gettext('Add auto expiration')}
</FormGroup> </Label>
</FormGroup>
{this.state.isExpireChecked &&
<FormGroup check>
<Label check>
<Input className="expire-input expire-input-border" type="text" value={this.state.expireDays} onChange={this.onExpireDaysChanged} readOnly={!this.state.isExpireChecked}/><span className="expir-span">{gettext('days')}</span>
</Label>
</FormGroup>
}
</Fragment>
)} )}
{this.state.isExpireChecked &&
<FormGroup check>
<Label check>
<Input className="expire-input expire-input-border" type="text" value={this.state.expireDays} onChange={this.onExpireDaysChanged} readOnly={!this.state.isExpireChecked}/><span className="expir-span">{gettext('days')}</span>
</Label>
</FormGroup>
}
{!this.isExpireDaysNoLimit && ( {!this.isExpireDaysNoLimit && (
<FormGroup check> <Fragment>
<Label check> <FormGroup check>
<Input className="expire-checkbox" type="checkbox" onChange={this.onExpireChecked} checked readOnly/>{' '}{gettext('Add auto expiration')} <Label check>
<Input className="expire-input" type="text" value={this.state.expireDays} onChange={this.onExpireDaysChanged} /> <span>{gettext('days')}</span> <Input className="expire-checkbox" type="checkbox" onChange={this.onExpireChecked} checked readOnly disabled/>{' '}{gettext('Add auto expiration')}
{(parseInt(shareLinkExpireDaysMin) !== 0 && parseInt(shareLinkExpireDaysMax) !== 0) && ( </Label>
<span> ({shareLinkExpireDaysMin} - {shareLinkExpireDaysMax}{' '}{gettext('days')})</span> </FormGroup>
)} <FormGroup check>
{(parseInt(shareLinkExpireDaysMin) !== 0 && parseInt(shareLinkExpireDaysMax) === 0) && ( <Label check>
<span> ({gettext('Greater than or equal to')} {shareLinkExpireDaysMin}{' '}{gettext('days')})</span> <Input className="expire-input expire-input-border" type="text" value={this.state.expireDays} onChange={this.onExpireDaysChanged} /><span className="expir-span">{gettext('days')}</span>
)} {(parseInt(shareLinkExpireDaysMin) !== 0 && parseInt(shareLinkExpireDaysMax) !== 0) && (
{(parseInt(shareLinkExpireDaysMin) === 0 && parseInt(shareLinkExpireDaysMax) !== 0) && ( <span className="d-inline-block ml-7">({shareLinkExpireDaysMin} - {shareLinkExpireDaysMax}{' '}{gettext('days')})</span>
<span> ({gettext('Less than or equal to')} {shareLinkExpireDaysMax}{' '}{gettext('days')})</span> )}
)} {(parseInt(shareLinkExpireDaysMin) !== 0 && parseInt(shareLinkExpireDaysMax) === 0) && (
</Label> <span className="d-inline-block ml-7">({gettext('Greater than or equal to')} {shareLinkExpireDaysMin}{' '}{gettext('days')})</span>
</FormGroup> )}
{(parseInt(shareLinkExpireDaysMin) === 0 && parseInt(shareLinkExpireDaysMax) !== 0) && (
<span className="d-inline-block ml-7">({gettext('Less than or equal to')} {shareLinkExpireDaysMax}{' '}{gettext('days')})</span>
)}
</Label>
</FormGroup>
</Fragment>
)} )}
<FormGroup check> <FormGroup check>
<Label check> <Label check>