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

js/components/ascribe_detail/edition.js

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

js/components/ascribe_detail/edition_container.js

@@ -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

js/components/ascribe_settings/contract_settings.js

@@ -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>
         );
     }