mirror of
https://github.com/ascribe/onion.git
synced 2024-12-23 01:39:36 +01:00
Merged in AD-1089-problem-occurred-message-when-tr (pull request #96)
Fix share button on ikonotv
This commit is contained in:
commit
bb93a052b7
@ -49,7 +49,7 @@ let WalletActionPanel = React.createClass({
|
|||||||
className="text-center ascribe-button-list"
|
className="text-center ascribe-button-list"
|
||||||
availableAcls={availableAcls}
|
availableAcls={availableAcls}
|
||||||
editions={this.props.piece}
|
editions={this.props.piece}
|
||||||
handleSuccess={this.loadPiece}>
|
handleSuccess={this.props.loadPiece}>
|
||||||
<AclProxy
|
<AclProxy
|
||||||
aclObject={this.props.currentUser.acl}
|
aclObject={this.props.currentUser.acl}
|
||||||
aclName="acl_wallet_submit">
|
aclName="acl_wallet_submit">
|
||||||
@ -58,7 +58,6 @@ let WalletActionPanel = React.createClass({
|
|||||||
aclName="acl_wallet_submit">
|
aclName="acl_wallet_submit">
|
||||||
<SubmitButtonType
|
<SubmitButtonType
|
||||||
className="btn-sm"
|
className="btn-sm"
|
||||||
handleSuccess={this.handleSubmitSuccess}
|
|
||||||
piece={this.props.piece}/>
|
piece={this.props.piece}/>
|
||||||
</AclProxy>
|
</AclProxy>
|
||||||
</AclProxy>
|
</AclProxy>
|
||||||
|
@ -21,6 +21,10 @@ import { getLangText } from '../../../../../../utils/lang_utils';
|
|||||||
import { mergeOptions } from '../../../../../../utils/general_utils';
|
import { mergeOptions } from '../../../../../../utils/general_utils';
|
||||||
|
|
||||||
let CylandPieceContainer = React.createClass({
|
let CylandPieceContainer = React.createClass({
|
||||||
|
propTypes: {
|
||||||
|
params: React.PropTypes.object
|
||||||
|
},
|
||||||
|
|
||||||
getInitialState() {
|
getInitialState() {
|
||||||
return mergeOptions(
|
return mergeOptions(
|
||||||
PieceStore.getState(),
|
PieceStore.getState(),
|
||||||
|
@ -9,7 +9,6 @@ import { getLangText } from '../../../../../../utils/lang_utils';
|
|||||||
let IkonotvSubmitButton = React.createClass({
|
let IkonotvSubmitButton = React.createClass({
|
||||||
propTypes: {
|
propTypes: {
|
||||||
className: React.PropTypes.string,
|
className: React.PropTypes.string,
|
||||||
handleSuccess: React.PropTypes.func,
|
|
||||||
piece: React.PropTypes.object.isRequired
|
piece: React.PropTypes.object.isRequired
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -22,7 +22,12 @@ import AppConstants from '../../../../../../constants/application_constants';
|
|||||||
import { getLangText } from '../../../../../../utils/lang_utils';
|
import { getLangText } from '../../../../../../utils/lang_utils';
|
||||||
import { mergeOptions } from '../../../../../../utils/general_utils';
|
import { mergeOptions } from '../../../../../../utils/general_utils';
|
||||||
|
|
||||||
|
|
||||||
let IkonotvPieceContainer = React.createClass({
|
let IkonotvPieceContainer = React.createClass({
|
||||||
|
propTypes: {
|
||||||
|
params: React.PropTypes.object
|
||||||
|
},
|
||||||
|
|
||||||
getInitialState() {
|
getInitialState() {
|
||||||
return mergeOptions(
|
return mergeOptions(
|
||||||
PieceStore.getState(),
|
PieceStore.getState(),
|
||||||
|
Loading…
Reference in New Issue
Block a user