mirror of
https://github.com/ansible/awx.git
synced 2026-02-28 00:08:44 -03:30
Fix rebase errors
This commit is contained in:
@@ -158,7 +158,9 @@ class Organization extends Component {
|
|||||||
<Route
|
<Route
|
||||||
path="/organizations/:id/access"
|
path="/organizations/:id/access"
|
||||||
render={() => (
|
render={() => (
|
||||||
<OrganizationAccess />
|
<OrganizationAccess
|
||||||
|
organization={organization}
|
||||||
|
/>
|
||||||
)}
|
)}
|
||||||
/>
|
/>
|
||||||
<Route
|
<Route
|
||||||
|
|||||||
@@ -23,10 +23,12 @@ class OrganizationAccess extends React.Component {
|
|||||||
}
|
}
|
||||||
|
|
||||||
render () {
|
render () {
|
||||||
|
const { organization } = this.props;
|
||||||
return (
|
return (
|
||||||
<OrganizationAccessList
|
<OrganizationAccessList
|
||||||
getAccessList={this.getOrgAccessList}
|
getAccessList={this.getOrgAccessList}
|
||||||
removeRole={this.removeRole}
|
removeRole={this.removeRole}
|
||||||
|
organization={organization}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user