ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Code Issues Releases Wiki Activity

Merge pull request #155 from ascribe/fix-webhook-dispatch-collision

Browse Source 
Revert removal of altUser
This commit is contained in:
Brett Sun 2016-02-08 18:35:26 +01:00
commit 2b7c218a40
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/actions/user_actions.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
import { alt } from '../alt'; import { altUser } from '../alt';
class UserActions { class UserActions {
@ -15,4 +15,4 @@ class UserActions {
} }
} }
export default alt.createActions(UserActions); export default altUser.createActions(UserActions);

1
js/alt.js
View File

@ -4,4 +4,5 @@ import Alt from 'alt';
export let alt = new Alt(); export let alt = new Alt();
export let altThirdParty = new Alt(); export let altThirdParty = new Alt();
export let altUser = new Alt();
export let altWhitelabel = new Alt(); export let altWhitelabel = new Alt();

2
js/components/ascribe_settings/webhook_settings.js
View File

@ -140,7 +140,7 @@ let WebhookSettings = React.createClass({
a target url. a target url.
</p> </p>
</div> </div>
<AclProxy show={this.state.webhookEvents && this.state.webhookEvents.length}> <AclProxy show={this.state.webhookEvents && this.state.webhookEvents.length > 0}>
<Form <Form
ref="webhookCreateForm" ref="webhookCreateForm"
url={ApiUrls.webhooks} url={ApiUrls.webhooks}

7
js/stores/user_store.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
import { alt, altThirdParty } from '../alt'; import { alt, altWhitelabel, altUser, altThirdParty } from '../alt';
import EventActions from '../actions/event_actions'; import EventActions from '../actions/event_actions';
@ -56,8 +56,9 @@ class UserStore {
EventActions.userDidLogout(); EventActions.userDidLogout();
// Reset all stores back to their initial state // Reset all stores back to their initial state
// Don't recycle the whitelabel stores since they're not dependent on login
alt.recycle(); alt.recycle();
altWhitelabel.recycle();
altUser.recycle();
altThirdParty.recycle(); altThirdParty.recycle();
// Since we've just logged out, we can set this store's // Since we've just logged out, we can set this store's
@ -76,4 +77,4 @@ class UserStore {
} }
} }
export default alt.createStore(UserStore, 'UserStore'); export default altUser.createStore(UserStore, 'UserStore');