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 27062bf6..19d17a3a 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 @@ -42,12 +42,12 @@ class DashboardArticlePage extends React.Component { return (
- +
{(this.props.loading) ? : this.renderContent()} -
+
); } diff --git a/client/src/app/main/main-layout-header.js b/client/src/app/main/main-layout-header.js index 7c705740..5f575136 100644 --- a/client/src/app/main/main-layout-header.js +++ b/client/src/app/main/main-layout-header.js @@ -32,7 +32,7 @@ class MainLayoutHeader extends React.Component { result = (
- {this.props.config === true ? : null} + {(this.props.config['registration'] === true) ? : null}
); } diff --git a/client/src/data/fixtures/system-fixtures.js b/client/src/data/fixtures/system-fixtures.js index d98c393a..37b65062 100644 --- a/client/src/data/fixtures/system-fixtures.js +++ b/client/src/data/fixtures/system-fixtures.js @@ -19,6 +19,7 @@ module.exports = [ 'smtp-port': '7070', 'smtp-user': 'Wesa', 'maintenance-mode': false, + 'user-system-enabled': true, 'allow-attachments': true, 'registration': true, 'max-size': 500, @@ -41,7 +42,8 @@ module.exports = [ 'layout': 'Boxed', 'reCaptchaKey': '6LfM5CYTAAAAAGLz6ctpf-hchX2_l0Ge-Bn-n8wS', 'maintenance-mode': false, - 'user-system-enabled': false, + 'user-system-enabled': true, + 'registration': true, 'departments': [ {id: 1, name: 'Sales Support', owners: 2}, {id: 2, name: 'Technical Issues', owners: 5},