Do not load LDAP configuration on store init

Instead, get the configuration when loading the component. Fixes #2572
Graylog2 · Aug 1, 2016 · e158568 · e158568
1 parent 6711f52
commit e158568
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/graylog2-web-interface/src/components/authentication/LegacyLdapConfig.js b/graylog2-web-interface/src/components/authentication/LegacyLdapConfig.js
@@ -5,6 +5,9 @@ import { Button } from 'react-bootstrap';
 import LdapComponent from 'components/ldap/LdapComponent';
 import LdapGroupsComponent from 'components/ldap/LdapGroupsComponent';
 
+import CombinedProvider from 'injection/CombinedProvider';
+const { LdapActions } = CombinedProvider.get('Ldap');
+
 const LegacyLdapConfig = React.createClass({
   propTypes: {
     config: PropTypes.object,
@@ -15,6 +18,10 @@ const LegacyLdapConfig = React.createClass({
     };
   },
 
+  componentDidMount() {
+    LdapActions.loadSettings();
+  },
+
   _toggleButton() {
     this.setState({ showSettings: !this.state.showSettings });
   },

diff --git a/graylog2-web-interface/src/stores/ldap/LdapStore.js b/graylog2-web-interface/src/stores/ldap/LdapStore.js
@@ -12,10 +12,6 @@ const LdapStore = Reflux.createStore({
   sourceUrl: '/system/ldap/',
   ldapSettings: undefined,
 
-  init() {
-    this.loadSettings();
-  },
-
   getInitialState() {
     return {ldapSettings: this.ldapSettings};
   },