mirror of
https://github.com/ascribe/onion.git
synced 2024-12-23 01:39:36 +01:00
resolve merge conflict
This commit is contained in:
commit
ffd1326366
@ -5,28 +5,26 @@ import PaginationButton from './pagination_button';
|
|||||||
let Pagination = React.createClass({
|
let Pagination = React.createClass({
|
||||||
propTypes: {
|
propTypes: {
|
||||||
goToPage: React.PropTypes.func.isRequired,
|
goToPage: React.PropTypes.func.isRequired,
|
||||||
currentPage: React.PropTypes.oneOfType([
|
currentPage: React.PropTypes.number.isRequired,
|
||||||
React.PropTypes.string,
|
totalPages: React.PropTypes.number.isRequired
|
||||||
React.PropTypes.number
|
|
||||||
]).isRequired
|
|
||||||
//itemListCount: React.PropTypes.number.isRequired
|
//itemListCount: React.PropTypes.number.isRequired
|
||||||
},
|
},
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
let currentPage = parseInt(this.props.currentPage, 10);
|
|
||||||
|
|
||||||
return(
|
return(
|
||||||
<nav>
|
<nav>
|
||||||
<ul className="pager">
|
<ul className="pager">
|
||||||
<PaginationButton
|
<PaginationButton
|
||||||
direction='previous'
|
direction='previous'
|
||||||
goToPage={this.props.goToPage}
|
goToPage={this.props.goToPage}
|
||||||
currentPage={currentPage}>
|
currentPage={this.props.currentPage}
|
||||||
|
totalPages={this.props.totalPages}>
|
||||||
</PaginationButton>
|
</PaginationButton>
|
||||||
<PaginationButton
|
<PaginationButton
|
||||||
direction='next'
|
direction='next'
|
||||||
goToPage={this.props.goToPage}
|
goToPage={this.props.goToPage}
|
||||||
currentPage={currentPage}>
|
currentPage={this.props.currentPage}
|
||||||
|
totalPages={this.props.totalPages}>
|
||||||
</PaginationButton>
|
</PaginationButton>
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
@ -7,14 +7,19 @@ let PaginationButton = React.createClass({
|
|||||||
propTypes: {
|
propTypes: {
|
||||||
direction: React.PropTypes.oneOf(['previous', 'next']),
|
direction: React.PropTypes.oneOf(['previous', 'next']),
|
||||||
goToPage: React.PropTypes.func.isRequired,
|
goToPage: React.PropTypes.func.isRequired,
|
||||||
currentPage: React.PropTypes.number.isRequired
|
currentPage: React.PropTypes.number.isRequired,
|
||||||
|
totalPages: React.PropTypes.number.isRequired
|
||||||
|
},
|
||||||
|
|
||||||
|
isInRange(page) {
|
||||||
|
return page > 0 && page <= this.props.totalPages;
|
||||||
},
|
},
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
let page = parseInt(this.props.currentPage, 10);
|
|
||||||
let directionDisplay;
|
let directionDisplay;
|
||||||
|
let page = this.props.currentPage;
|
||||||
let isDisabled = '';
|
let isDisabled = '';
|
||||||
|
let anchor;
|
||||||
|
|
||||||
if(this.props.direction === 'previous') {
|
if(this.props.direction === 'previous') {
|
||||||
page -= 1;
|
page -= 1;
|
||||||
@ -32,17 +37,26 @@ let PaginationButton = React.createClass({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(page === 0) {
|
if (this.isInRange(page)) {
|
||||||
isDisabled += ' disabled';
|
anchor = (
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<li className={this.props.direction + isDisabled }>
|
|
||||||
<Link to="pieces"
|
<Link to="pieces"
|
||||||
query={{page}}
|
query={{page}}
|
||||||
onClick={this.props.goToPage(page)}>
|
onClick={this.props.goToPage(page)}>
|
||||||
{directionDisplay}
|
{directionDisplay}
|
||||||
</Link>
|
</Link>
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
isDisabled += ' disabled';
|
||||||
|
anchor = (
|
||||||
|
<a>
|
||||||
|
{directionDisplay}
|
||||||
|
</a>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<li className={this.props.direction + isDisabled }>
|
||||||
|
{anchor}
|
||||||
</li>
|
</li>
|
||||||
);
|
);
|
||||||
}
|
}
|
@ -26,7 +26,6 @@ let Table = React.createClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
|
||||||
if(this.props.itemList && this.props.itemList.length > 0) {
|
if(this.props.itemList && this.props.itemList.length > 0) {
|
||||||
return (
|
return (
|
||||||
<div className="ascribe-table">
|
<div className="ascribe-table">
|
||||||
|
@ -16,7 +16,7 @@ import TableItemSubtableButton from './ascribe_table/table_item_subtable_button'
|
|||||||
|
|
||||||
import TableColumnContentModel from '../models/table_column_content_model';
|
import TableColumnContentModel from '../models/table_column_content_model';
|
||||||
|
|
||||||
import Pagination from './pagination'
|
import Pagination from './ascribe_pagination/pagination'
|
||||||
|
|
||||||
|
|
||||||
let PieceList = React.createClass({
|
let PieceList = React.createClass({
|
||||||
@ -30,12 +30,23 @@ let PieceList = React.createClass({
|
|||||||
PieceListActions.fetchPieceList(page, this.state.pageSize, this.state.search, this.state.orderBy, this.state.orderAsc);
|
PieceListActions.fetchPieceList(page, this.state.pageSize, this.state.search, this.state.orderBy, this.state.orderAsc);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
componentWillUnmount() {
|
||||||
|
PieceListStore.unlisten(this.onChange);
|
||||||
|
},
|
||||||
|
|
||||||
|
onChange() {
|
||||||
|
this.setState(this.getInitialState());
|
||||||
|
},
|
||||||
|
|
||||||
paginationGoToPage(page) {
|
paginationGoToPage(page) {
|
||||||
return () => PieceListActions.fetchPieceList(page, this.state.pageSize, this.state.search, this.state.orderBy, this.state.orderAsc);
|
return (e) => PieceListActions.fetchPieceList(page, this.state.pageSize,
|
||||||
|
this.state.search, this.state.orderBy,
|
||||||
|
this.state.orderAsc);
|
||||||
},
|
},
|
||||||
|
|
||||||
tableChangeOrder(orderBy, orderAsc) {
|
tableChangeOrder(orderBy, orderAsc) {
|
||||||
PieceListActions.fetchPieceList(this.state.page, this.state.pageSize, this.state.search, orderBy, orderAsc);
|
PieceListActions.fetchPieceList(this.state.page, this.state.pageSize,
|
||||||
|
this.state.search, orderBy, orderAsc);
|
||||||
},
|
},
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
@ -45,6 +56,9 @@ let PieceList = React.createClass({
|
|||||||
new TableColumnContentModel('title', 'Title', TableItemText, 4, true)
|
new TableColumnContentModel('title', 'Title', TableItemText, 4, true)
|
||||||
];
|
];
|
||||||
|
|
||||||
|
let currentPage = parseInt(this.props.query.page, 10);
|
||||||
|
let totalPages = Math.ceil(this.state.pieceListCount / this.state.pageSize)
|
||||||
|
|
||||||
// Could wrap this altContainer potentially once again.
|
// Could wrap this altContainer potentially once again.
|
||||||
return (
|
return (
|
||||||
<AltContainer
|
<AltContainer
|
||||||
@ -63,7 +77,9 @@ let PieceList = React.createClass({
|
|||||||
<Table columnList={columnList} changeOrder={this.tableChangeOrder}>
|
<Table columnList={columnList} changeOrder={this.tableChangeOrder}>
|
||||||
<TableItemSubtable store={EditionListStore} actions={EditionListActions}></TableItemSubtable>
|
<TableItemSubtable store={EditionListStore} actions={EditionListActions}></TableItemSubtable>
|
||||||
</Table>
|
</Table>
|
||||||
<Pagination currentPage={this.props.query.page} goToPage={this.paginationGoToPage} />
|
<Pagination currentPage={currentPage}
|
||||||
|
totalPages={totalPages}
|
||||||
|
goToPage={this.paginationGoToPage} />
|
||||||
</AltContainer>
|
</AltContainer>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user