mirror of
https://github.com/ascribe/onion.git
synced 2024-11-15 09:35:10 +01:00
merged
This commit is contained in:
parent
44f0b36e73
commit
4edc728278
@ -6,12 +6,8 @@ import Router from 'react-router';
|
|||||||
import Row from 'react-bootstrap/lib/Row';
|
import Row from 'react-bootstrap/lib/Row';
|
||||||
import Col from 'react-bootstrap/lib/Col';
|
import Col from 'react-bootstrap/lib/Col';
|
||||||
|
|
||||||
import CollapsibleParagraph from './../ascribe_collapsible/collapsible_paragraph';
|
|
||||||
|
|
||||||
import DetailProperty from './detail_property';
|
import DetailProperty from './detail_property';
|
||||||
|
|
||||||
import FurtherDetails from './further_details';
|
|
||||||
|
|
||||||
import UserActions from '../../actions/user_actions';
|
import UserActions from '../../actions/user_actions';
|
||||||
import UserStore from '../../stores/user_store';
|
import UserStore from '../../stores/user_store';
|
||||||
|
|
||||||
@ -37,13 +33,15 @@ import GlobalNotificationActions from '../../actions/global_notification_actions
|
|||||||
import { getLangText } from '../../utils/lang_utils';
|
import { getLangText } from '../../utils/lang_utils';
|
||||||
import { mergeOptions } from '../../utils/general_utils';
|
import { mergeOptions } from '../../utils/general_utils';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is the component that implements display-specific functionality
|
* This is the component that implements display-specific functionality
|
||||||
*/
|
*/
|
||||||
let Piece = React.createClass({
|
let Piece = React.createClass({
|
||||||
propTypes: {
|
propTypes: {
|
||||||
piece: React.PropTypes.object,
|
piece: React.PropTypes.object,
|
||||||
loadPiece: React.PropTypes.func
|
loadPiece: React.PropTypes.func,
|
||||||
|
children: React.PropTypes.object
|
||||||
},
|
},
|
||||||
|
|
||||||
mixins: [Router.Navigation],
|
mixins: [Router.Navigation],
|
||||||
@ -159,20 +157,8 @@ let Piece = React.createClass({
|
|||||||
</AclButtonList>
|
</AclButtonList>
|
||||||
|
|
||||||
{this.getCreateEditionsDialog()}
|
{this.getCreateEditionsDialog()}
|
||||||
|
{this.props.children}
|
||||||
|
|
||||||
<CollapsibleParagraph
|
|
||||||
title="Further Details"
|
|
||||||
show={this.props.piece.acl.acl_edit
|
|
||||||
|| Object.keys(this.props.piece.extra_data).length > 0
|
|
||||||
|| this.props.piece.other_data !== null}
|
|
||||||
defaultExpanded={true}>
|
|
||||||
<FurtherDetails
|
|
||||||
editable={this.props.piece.acl.acl_edit}
|
|
||||||
pieceId={this.props.piece.id}
|
|
||||||
extraData={this.props.piece.extra_data}
|
|
||||||
otherData={this.props.piece.other_data}
|
|
||||||
handleSuccess={this.props.loadPiece}/>
|
|
||||||
</CollapsibleParagraph>
|
|
||||||
</Col>
|
</Col>
|
||||||
</Row>
|
</Row>
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user