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

bug fix acls

Browse Source 
otherdata frontend

MIGRATE + loaddate whitelabel
This commit is contained in:
diminator 2015-08-20 11:32:11 +02:00
parent 1f1a8b7761
commit 5b2ab6c1e2
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/ascribe_detail/edition.js
View File

@ -165,7 +165,7 @@ let Edition = React.createClass({
title={getLangText('Further Details')} title={getLangText('Further Details')}
show={this.props.edition.acl.acl_edit show={this.props.edition.acl.acl_edit
|| Object.keys(this.props.edition.extra_data).length > 0 || Object.keys(this.props.edition.extra_data).length > 0
|| this.props.edition.other_data !== null}> || this.props.edition.other_data.length > 0}>
<EditionFurtherDetails <EditionFurtherDetails
editable={this.props.edition.acl.acl_edit} editable={this.props.edition.acl.acl_edit}
pieceId={this.props.edition.parent} pieceId={this.props.edition.parent}

1
js/components/ascribe_detail/further_details.js
View File

@ -51,7 +51,6 @@ let FurtherDetails = React.createClass({
}, },
render() { render() {
//return (<span />);
return ( return (
<Row> <Row>
<Col md={12} className="ascribe-edition-personal-note"> <Col md={12} className="ascribe-edition-personal-note">

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

@ -33,8 +33,8 @@ let FurtherDetailsFileuploader = React.createClass({
// //
// 1. there is no other_data => do not show the fileuploader at all // 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 // 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 // 3. both other_data and editable are defined or true => show fileuploader with all action buttons
if (!this.props.editable && !this.props.otherData){ if (!this.props.editable && (!this.props.otherData || this.props.otherData.length == 0)){
return null; return null;
} }
let otherDataIds = this.props.otherData ? this.props.otherData.map((data)=>{return data.id; }).join() : null; let otherDataIds = this.props.otherData ? this.props.otherData.map((data)=>{return data.id; }).join() : null;

2
js/components/ascribe_detail/piece_container.js
View File

@ -183,7 +183,7 @@ let PieceContainer = React.createClass({
title="Further Details" title="Further Details"
show={this.state.piece.acl.acl_edit show={this.state.piece.acl.acl_edit
|| Object.keys(this.state.piece.extra_data).length > 0 || Object.keys(this.state.piece.extra_data).length > 0
|| this.state.piece.other_data !== null} || this.state.piece.other_data.length > 0}
defaultExpanded={true}> defaultExpanded={true}>
<FurtherDetails <FurtherDetails
editable={this.state.piece.acl.acl_edit} editable={this.state.piece.acl.acl_edit}

2
js/components/whitelabel/wallet/wallet_app.js
View File

@ -20,7 +20,7 @@ let WalletApp = React.createClass({
header = ( header = (
<div className="hero"/>); <div className="hero"/>);
} else { } else {
header = <Header showAddWork={false} />; header = <Header showAddWork={true} />;
} }
return ( return (
<div className="container ascribe-prize-app"> <div className="container ascribe-prize-app">