External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-10 02:47:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
Alex Corey
2019-04-29 17:00:04 -04:00
parent 6fe93f474f
commit 33f7bf67e1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pages/Organizations/screens/OrganizationsList.jsx
View File

@@ -62,8 +62,7 @@ class OrganizationsList extends Component {
loading: true, loading: true,
results: [], results: [],
selected: [], selected: [],
isModalOpen: false isModalOpen: false,
}; };
this.onSearch = this.onSearch.bind(this); this.onSearch = this.onSearch.bind(this);
@@ -77,7 +76,7 @@ class OrganizationsList extends Component {
this.fetchOrganizations = this.fetchOrganizations.bind(this); this.fetchOrganizations = this.fetchOrganizations.bind(this);
this.handleOrgDelete = this.handleOrgDelete.bind(this); this.handleOrgDelete = this.handleOrgDelete.bind(this);
this.handleOpenOrgDeleteModal = this.handleOpenOrgDeleteModal.bind(this); this.handleOpenOrgDeleteModal = this.handleOpenOrgDeleteModal.bind(this);
this.handleCloseOrgDeleteModal = this.handleCloseOrgDeleteModal.bind(this); this.handleClearOrgDeleteModal = this.handleClearOrgDeleteModal.bind(this);
} }
componentDidMount () { componentDidMount () {
@@ -144,9 +143,10 @@ class OrganizationsList extends Component {
return Object.assign({}, DEFAULT_PARAMS, searchParams, overrides); return Object.assign({}, DEFAULT_PARAMS, searchParams, overrides);
} }
handleCloseOrgDeleteModal () { handleClearOrgDeleteModal () {
this.setState({ this.setState({
isModalOpen: false isModalOpen: false,
selected: []
}); });
} }