address pr issues

This commit is contained in:
Alex Corey
2019-05-01 11:05:29 -04:00
parent c4a4275a89
commit f704f320b5
7 changed files with 37 additions and 27 deletions

View File

@@ -125,7 +125,8 @@ class Organization extends Component {
} = this.state;
const tabsPaddingOverride = {
padding: '0'
padding: '0',
borderBottom: '1px solid black'
};
const canSeeNotificationsTab = me.is_system_auditor || isNotifAdmin || isAuditorOfThisOrg;

View File

@@ -285,6 +285,7 @@ class OrganizationsList extends Component {
selected.length === 0
|| selected.some(row => !row.summary_fields.user_capabilities.delete)
);
const deleteToolTipContent = disableDelete ? i18nMark('Select a row to delete') : i18nMark('Delete');
return (
<I18n>
@@ -337,7 +338,10 @@ class OrganizationsList extends Component {
onSort={this.onSort}
onSelectAll={this.onSelectAll}
onOpenDeleteModal={this.handleOpenOrgDeleteModal}
disableTrashCanIcon={disableDelete}
disableDeleteIcon={disableDelete}
deleteIconStyling={disableDelete ? 'awx-ToolBarBtn awx-ToolBarBtn--disabled'
: 'awx-ToolBarBtn'}
deleteTooltip={
selected.some(row => !row.summary_fields.user_capabilities.delete) ? (
<div>
@@ -353,7 +357,7 @@ class OrganizationsList extends Component {
))
}
</div>
) : undefined
) : deleteToolTipContent
}
showDelete
showSelectAll