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

fixed logout

Browse Source
This commit is contained in:
ddejongh 2015-06-16 20:35:19 +02:00
parent ff12048c10
commit d50b3ca14d
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/components/edition.js
View File

@ -102,6 +102,7 @@ let Edition = React.createClass({
</CollapsibleEditionDetails> </CollapsibleEditionDetails>
<CollapsibleEditionDetails <CollapsibleEditionDetails
title="Edition Note (public)" title="Edition Note (public)"
show={this.props.edition.acl.indexOf('edit') > -1 || this.props.edition.public_note}
iconName="pencil"> iconName="pencil">
<EditionPublicEditionNote <EditionPublicEditionNote
handleSuccess={this.props.loadEdition} handleSuccess={this.props.loadEdition}

13
js/components/header.js
View File

@ -7,7 +7,8 @@ import UserActions from '../actions/user_actions';
import UserStore from '../stores/user_store'; import UserStore from '../stores/user_store';
import apiUrls from '../constants/api_urls.js'; import apiUrls from '../constants/api_urls.js';
import PieceListActions from '../actions/piece_list_actions'; //import PieceListActions from '../actions/piece_list_actions';
import requests from '../utils/requests';
import Nav from 'react-bootstrap/lib/Nav'; import Nav from 'react-bootstrap/lib/Nav';
import Navbar from 'react-bootstrap/lib/Navbar'; import Navbar from 'react-bootstrap/lib/Navbar';
@ -24,7 +25,7 @@ import { getLangText } from '../utils/lang_utils';
let Link = Router.Link; let Link = Router.Link;
let Header = React.createClass({ let Header = React.createClass({
mixins: [Router.Navigation], //mixins: [Router.Navigation],
getInitialState() { getInitialState() {
return UserStore.getState(); return UserStore.getState();
@ -38,7 +39,11 @@ let Header = React.createClass({
componentWillUnmount() { componentWillUnmount() {
UserStore.unlisten(this.onChange); UserStore.unlisten(this.onChange);
}, },
handleLogout(){
requests
.get(apiUrls.users_logout)
.then(this.refreshData);
},
onChange(state) { onChange(state) {
this.setState(state); this.setState(state);
}, },
@ -57,7 +62,7 @@ let Header = React.createClass({
<MenuItem eventKey="2" href="/art/faq/">{getLangText('FAQ')}</MenuItem> <MenuItem eventKey="2" href="/art/faq/">{getLangText('FAQ')}</MenuItem>
<MenuItem eventKey="3" href="/art/terms/">{getLangText('Terms of Service')}</MenuItem> <MenuItem eventKey="3" href="/art/terms/">{getLangText('Terms of Service')}</MenuItem>
<MenuItem divider /> <MenuItem divider />
<MenuItem eventKey="4" href={apiUrls.users_logout}>{getLangText('Log out')}</MenuItem> <MenuItem eventKey="4" href="#" onClick={this.handleLogout}>{getLangText('Log out')}</MenuItem>
</DropdownButton> </DropdownButton>
); );
} }