diff --git a/client/src/app/admin/panel/tickets/admin-panel-my-tickets.js b/client/src/app/admin/panel/tickets/admin-panel-my-tickets.js
index 8a07c702..94e39ebe 100644
--- a/client/src/app/admin/panel/tickets/admin-panel-my-tickets.js
+++ b/client/src/app/admin/panel/tickets/admin-panel-my-tickets.js
@@ -25,10 +25,11 @@ class AdminPanelMyTickets extends React.Component {
state = {
closedTicketsShown: false,
+ departmentId: null,
};
componentDidMount() {
- this.retrieveMyTickets()
+ this.retrieveMyTickets();
}
render() {
@@ -57,7 +58,11 @@ class AdminPanelMyTickets extends React.Component {
onClosedTicketsShownChange: this.onClosedTicketsShownChange.bind(this),
pages: this.props.pages,
page: this.props.page,
- onPageChange: event => this.retrieveMyTickets(event.target.value)
+ onPageChange: event => this.retrieveMyTickets(event.target.value),
+ onDepartmentChange: departmentId => {
+ this.setState({departmentId});
+ this.retrieveMyTickets(1, this.state.closedTicketsShown, departmentId);
+ },
};
}
@@ -85,8 +90,8 @@ class AdminPanelMyTickets extends React.Component {
this.retrieveMyTickets();
}
- retrieveMyTickets(page = this.props.page, closed = this.state.closedTicketsShown) {
- this.props.dispatch(AdminDataAction.retrieveMyTickets(page, closed * 1));
+ retrieveMyTickets(page = this.props.page, closed = this.state.closedTicketsShown, departmentId = this.state.departmentId) {
+ this.props.dispatch(AdminDataAction.retrieveMyTickets(page, closed * 1, departmentId));
}
}
diff --git a/client/src/app/admin/panel/tickets/admin-panel-new-tickets.js b/client/src/app/admin/panel/tickets/admin-panel-new-tickets.js
index 7f0f2ccb..40edb648 100644
--- a/client/src/app/admin/panel/tickets/admin-panel-new-tickets.js
+++ b/client/src/app/admin/panel/tickets/admin-panel-new-tickets.js
@@ -15,7 +15,11 @@ class AdminPanelNewTickets extends React.Component {
page: 1,
userId: 0,
departments: [],
- tickets: []
+ tickets: [],
+ };
+
+ state = {
+ departmentId: null,
};
componentDidMount() {
@@ -43,12 +47,16 @@ class AdminPanelNewTickets extends React.Component {
ticketPath: '/admin/panel/tickets/view-ticket/',
page: this.props.page,
pages: this.props.pages,
- onPageChange: event => this.retrieveNewTickets(event.target.value)
+ onPageChange: event => this.retrieveNewTickets(event.target.value),
+ onDepartmentChange: departmentId => {
+ this.setState({departmentId});
+ this.retrieveNewTickets(1, departmentId);
+ },
};
}
- retrieveNewTickets(page = this.props.page) {
- this.props.dispatch(AdminDataAction.retrieveNewTickets(page));
+ retrieveNewTickets(page = this.props.page, departmentId = this.state.departmentId) {
+ this.props.dispatch(AdminDataAction.retrieveNewTickets(page, departmentId));
}
}
diff --git a/client/src/app/demo/components-demo-page.js b/client/src/app/demo/components-demo-page.js
index 03a97478..5555ce23 100644
--- a/client/src/app/demo/components-demo-page.js
+++ b/client/src/app/demo/components-demo-page.js
@@ -1,7 +1,7 @@
'use strict';
const React = require('react');
-const LineChart = require("react-chartjs-2").Line;
+// const LineChart = require("react-chartjs-2").Line;
const _ = require('lodash');
const DocumentTitle = require('react-document-title');
@@ -230,8 +230,11 @@ let DemoPage = React.createClass({
},
{
title: 'LineChart',
+ // render: (
+ //
+ // ),
render: (
-
+ null
)
}
],
diff --git a/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.js b/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.js
index 19d17a3a..b7f0faa0 100644
--- a/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.js
+++ b/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.js
@@ -76,9 +76,9 @@ class DashboardArticlePage extends React.Component {
getClass() {
let classes = {
'dashboard-article-page': true,
- 'dashboard-article-page_wrapped': _.startsWith(this.props.location.pathname, '/article/')
+ 'dashboard-article-page_wrapped': _.startsWith(this.props.location.pathname, '/dashboard/article/')
};
-
+
return classNames(classes);
}
diff --git a/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.scss b/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.scss
index aa91618e..36e309a2 100644
--- a/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.scss
+++ b/client/src/app/main/dashboard/dashboard-article/dashboard-article-page.scss
@@ -1,4 +1,5 @@
.dashboard-article-page {
+ word-break: break-word;
&__last-edited {
font-style: italic;
@@ -9,4 +10,4 @@
&_wrapped {
padding: 0 15px;
}
-}
\ No newline at end of file
+}
diff --git a/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.js b/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.js
index b76ecc9a..3ab6516a 100644
--- a/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.js
+++ b/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.js
@@ -76,7 +76,7 @@ class DashboardListArticlesPage extends React.Component {
getClass() {
let classes = {
'dashboard-list-articles-page': true,
- 'dashboard-list-articles-page_wrapped': (this.props.location.pathname == '/articles'),
+ 'dashboard-list-articles-page_wrapped': (this.props.location.pathname == '/dashboard/articles'),
'col-md-10 col-md-offset-1': (!this.props.config['user-system-enabled'])
};
diff --git a/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.scss b/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.scss
index 709461c1..8cea0a52 100644
--- a/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.scss
+++ b/client/src/app/main/dashboard/dashboard-list-articles/dashboard-list-articles-page.scss
@@ -31,6 +31,7 @@
}
&_wrapped {
+ word-break: break-word;
padding: 0 15px;
}
-}
\ No newline at end of file
+}
diff --git a/client/src/app/main/main-recover-password/main-recover-password-page.js b/client/src/app/main/main-recover-password/main-recover-password-page.js
index 9ad2c3d0..e8141c4e 100644
--- a/client/src/app/main/main-recover-password/main-recover-password-page.js
+++ b/client/src/app/main/main-recover-password/main-recover-password-page.js
@@ -74,7 +74,7 @@ class MainRecoverPasswordPage extends React.Component {
}).then(this.onPasswordRecovered.bind(this)).catch(this.onPasswordRecoverFail.bind(this));
}
- onPasswordRecovered(response) {
+ onPasswordRecovered(response = {data: {}}) {
setTimeout(() => {history.push((response.data.staff*1) ? '/admin' : '/')}, 2000);
this.setState({
recoverStatus: 'valid',
diff --git a/client/src/data/fixtures/staff-fixtures.js b/client/src/data/fixtures/staff-fixtures.js
index 16b991bc..f78fa530 100644
--- a/client/src/data/fixtures/staff-fixtures.js
+++ b/client/src/data/fixtures/staff-fixtures.js
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+const _ = require('lodash');
module.exports = [
{
diff --git a/client/src/data/fixtures/user-fixtures.js b/client/src/data/fixtures/user-fixtures.js
index 9c633176..e74cee45 100644
--- a/client/src/data/fixtures/user-fixtures.js
+++ b/client/src/data/fixtures/user-fixtures.js
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+const _ = require('lodash');
module.exports = [
{
diff --git a/client/src/index.html b/client/src/index.html
index 3e5e5b7a..969722e9 100755
--- a/client/src/index.html
+++ b/client/src/index.html
@@ -8,15 +8,11 @@
OpenSupports
-
-
+
-
-
-