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

Merge remote-tracking branch 'origin/AD-456-ikonotv-branded-page-for-registra' into AD-456-ikonotv-branded-page-for-registra

Browse Source
This commit is contained in:
diminator 2015-09-02 16:34:28 +02:00
commit 2450dce642
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,7 +305,6 @@ let EditionSummary = React.createClass({
<hr/>
</div>
);
}
});

3
js/components/ascribe_detail/edition_container.js
View File

@ -9,6 +9,8 @@ import Edition from './edition';
import AppConstants from '../../constants/application_constants';
/**
* This is the component that implements resource/data specific functionality
*/
@ -59,6 +61,7 @@ let EditionContainer = React.createClass({
},
render() {
console.log(this.state);
if('title' in this.state.edition) {
return (
<Edition

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

@ -5,14 +5,28 @@ import React from 'react';
import CollapsibleParagraph from '../ascribe_collapsible/collapsible_paragraph';
import CreateContractForm from '../ascribe_forms/form_create_contract';
import { getLangText } from '../../utils/lang_utils';
import ContractListStore from '../../stores/contract_list_store';
import ContractListActions from '../../actions/contract_list_actions';
import { getLangText } from '../../utils/lang_utils';
let ContractSettings = React.createClass({
propTypes: {
defaultExpanded: React.PropTypes.bool
},
getInitialState(){
return ContractListStore.getState();
},
componentDidMount() {
ContractListStore.listen(this.onChange);
ContractListActions.fetchContractList();
},
componentWillUnmount() {
ContractListStore.unlisten(this.onChange);
},
onChange(state) {
this.setState(state);
},
render() {
return (
<CollapsibleParagraph
@ -20,7 +34,18 @@ let ContractSettings = React.createClass({
show={true}
defaultExpanded={true}>
{/* this should be this.props.defaultExpanded */}
<CreateContractForm />
<CollapsibleParagraph
title={getLangText('List Contracts')}
show={true}
defaultExpanded={true}>
{this.state.contractList}
</CollapsibleParagraph>
<CollapsibleParagraph
title={getLangText('Create Contract')}
show={true}
defaultExpanded={true}>
<CreateContractForm />
</CollapsibleParagraph>
</CollapsibleParagraph>
);
}