diff --git a/client/src/actions/session-actions.js b/client/src/actions/session-actions.js index 08c95be8..2d1b7995 100644 --- a/client/src/actions/session-actions.js +++ b/client/src/actions/session-actions.js @@ -1,9 +1,8 @@ import API from 'lib-app/api-call'; +import AdminDataActions from 'actions/admin-data-actions'; import sessionStore from 'lib-app/session-store'; import store from 'app/store'; -import ConfigActions from 'actions/config-actions'; - export default { login(loginData) { return { @@ -13,6 +12,10 @@ export default { data: loginData }).then((result) => { store.dispatch(this.getUserData(result.data.userId, result.data.token, result.data.staff)); + + if(result.data.staff) { + store.dispatch(AdminDataActions.retrieveCustomResponses()); + } return result; }) diff --git a/client/src/app-components/ticket-viewer.js b/client/src/app-components/ticket-viewer.js index d45dd4b4..c324386a 100644 --- a/client/src/app-components/ticket-viewer.js +++ b/client/src/app-components/ticket-viewer.js @@ -20,6 +20,7 @@ class TicketViewer extends React.Component { ticket: React.PropTypes.object, onChange: React.PropTypes.func, editable: React.PropTypes.bool, + customResponses: React.PropTypes.array, assignmentAllowed: React.PropTypes.bool }; @@ -58,6 +59,7 @@ class TicketViewer extends React.Component {