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/master' into AD-727-missing-redirects-to-login-page

Browse Source 
Conflicts:
	js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js
This commit is contained in:
Tim Daubenschütz 2015-10-12 14:18:53 +02:00
commit d760fe13d0
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/components/ascribe_routes/proxy_routes/redirect_proxy_handler.js
View File

@ -79,7 +79,11 @@ export default function RedirectProxyHandler({to, when}) {
/* /*
* redirectAuthenticated contains an arbirary path * redirectAuthenticated contains an arbirary path
* eg pieces/<id>, editions/<bitcoin_id>, collection, settings, ... * eg pieces/<id>, editions/<bitcoin_id>, collection, settings, ...
* hence transitionTo cannot be used directly * hence transitionTo cannot be used directly.
*
* While we're getting rid of `query.redirect` explicitly in the
* above `else if` statement, here it's sufficient to just call
* `baseUrl` + `redirectAuthenticated`, as it gets rid of queries as well.
*/ */
window.location = AppConstants.baseUrl + redirectAuthenticated; window.location = AppConstants.baseUrl + redirectAuthenticated;
} }

3
js/components/whitelabel/wallet/components/ascribe_detail/wallet_action_panel.js
View File

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

3
js/components/whitelabel/wallet/components/cyland/ascribe_detail/cyland_piece_container.js
View File

@ -22,7 +22,8 @@ import { mergeOptions } from '../../../../../../utils/general_utils';
let CylandPieceContainer = React.createClass({ let CylandPieceContainer = React.createClass({
propTypes: { propTypes: {
location: React.PropTypes.object location: React.PropTypes.object,
params: React.PropTypes.object
}, },
getInitialState() { getInitialState() {

1
js/components/whitelabel/wallet/components/ikonotv/ascribe_buttons/ikonotv_submit_button.js
View File

@ -12,7 +12,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
}, },

5
js/components/whitelabel/wallet/components/ikonotv/ascribe_detail/ikonotv_piece_container.js
View File

@ -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(),