diff --git a/js/actions/piece_list_actions.js b/js/actions/piece_list_actions.js
index 2fd15c04..ae5ac090 100644
--- a/js/actions/piece_list_actions.js
+++ b/js/actions/piece_list_actions.js
@@ -57,7 +57,7 @@ class PieceListActions {
PieceListFetcher
.fetchRequestActions()
.then((res) => {
- this.actions.updatePieceListRequestActions(res.piece_ids);
+ this.actions.updatePieceListRequestActions(res);
})
.catch((err) => console.logGlobal(err));
}
diff --git a/js/components/ascribe_accordion_list/accordion_list_item_wallet.js b/js/components/ascribe_accordion_list/accordion_list_item_wallet.js
index f7bca334..178a7db4 100644
--- a/js/components/ascribe_accordion_list/accordion_list_item_wallet.js
+++ b/js/components/ascribe_accordion_list/accordion_list_item_wallet.js
@@ -61,12 +61,13 @@ let AccordionListItemWallet = React.createClass({
},
getGlyphicon(){
- if (this.props.content.requestAction && this.props.content.requestAction.length > 0) {
+ if ((this.props.content.request_action && this.props.content.request_action.length > 0) ||
+ (this.props.content.request_action_editions)){
return (
{getLangText('You have actions pending in one of your editions')}}>
+ overlay={{getLangText('You have actions pending')}}>
);
}
diff --git a/js/components/ascribe_detail/edition_container.js b/js/components/ascribe_detail/edition_container.js
index 3be63974..78b1e477 100644
--- a/js/components/ascribe_detail/edition_container.js
+++ b/js/components/ascribe_detail/edition_container.js
@@ -36,6 +36,15 @@ let EditionContainer = React.createClass({
EditionActions.fetchOne(this.props.params.editionId);
},
+ // This is done to update the container when the user clicks on the prev or next
+ // button to update the URL parameter (and therefore to switch pieces)
+ componentWillReceiveProps(nextProps) {
+ if(this.props.params.editionId !== nextProps.params.editionId) {
+ EditionActions.updateEdition({});
+ EditionActions.fetchOne(nextProps.params.editionId);
+ }
+ },
+
componentWillUnmount() {
// Every time we're leaving the edition detail page,
// just reset the edition that is saved in the edition store
diff --git a/js/components/ascribe_forms/form_create_contract.js b/js/components/ascribe_forms/form_create_contract.js
index 1b3fcfd6..416ae0e5 100644
--- a/js/components/ascribe_forms/form_create_contract.js
+++ b/js/components/ascribe_forms/form_create_contract.js
@@ -18,14 +18,20 @@ let CreateContractForm = React.createClass({
getInitialState() {
return {
- digitalWorkKey: null,
+ contractKey: null,
isUploadReady: false
};
},
+ getFormData(){
+ return {
+ blob: this.state.contractKey
+ };
+ },
+
submitKey(key) {
this.setState({
- digitalWorkKey: key
+ contractKey: key
});
},
@@ -39,6 +45,7 @@ let CreateContractForm = React.createClass({
return (