diff --git a/client/src/app-components/ticket-list.js b/client/src/app-components/ticket-list.js index 91a72830..cb4a9d9e 100644 --- a/client/src/app-components/ticket-list.js +++ b/client/src/app-components/ticket-list.js @@ -60,14 +60,14 @@ class TicketList extends React.Component {
{(type === 'primary') ? this.renderMessage() : null} - { - ((type === 'secondary') && showDepartmentDropdown) ? - this.renderDepartmentsDropDown() : - null - } + { + ((type === 'secondary') && showDepartmentDropdown) ? + this.renderDepartmentsDropDown() : + null + } {onClosedTicketsShownChange ? this.renderFilterCheckbox() : null}
- { + { showPageSizeDropdown ? this.pageSizeChange(event)} /> : null diff --git a/client/src/app-components/ticket-list.scss b/client/src/app-components/ticket-list.scss index 7e604426..5b977ca2 100644 --- a/client/src/app-components/ticket-list.scss +++ b/client/src/app-components/ticket-list.scss @@ -17,6 +17,7 @@ &__main-filters { display: flex; align-items: center; + width: 100%; } &__department-selector { @@ -62,3 +63,7 @@ } } + +.create-ticket-form__message { + width: 100%; +} \ No newline at end of file diff --git a/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.js b/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.js index bdba45d5..454d77be 100644 --- a/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.js +++ b/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.js @@ -56,6 +56,7 @@ class DashboardListTicketsPage extends React.Component { page={page} pages={pages} tickets={tickets} + showPageSizeDropdown={false} type={userUsers.length ? "secondary" : "primary"} /> { message ?