Merge branch 'reactify-admin/security' into reactify-security-setting

src/client/js/app.jsx

@@ -199,7 +199,7 @@ if (adminMarkDownSettingElem != null) {
   );
 }
 
-const adminSecuritySettingElem = document.getElementById('generalSetting');
+const adminSecuritySettingElem = document.getElementById('admin-security-setting');
 if (adminSecuritySettingElem != null) {
   const adminSecurityContainer = new AdminSecurityContainer(appContainer);
   ReactDOM.render(

src/client/js/services/AdminSecurityContainer.js

@@ -3,10 +3,10 @@ import { Container } from 'unstated';
 import loggerFactory from '@alias/logger';
 
 // eslint-disable-next-line no-unused-vars
-const logger = loggerFactory('growi:services:UserGroupDetailContainer');
+const logger = loggerFactory('growi:services:AdminSecurityContainer');
 
 /**
- * Service container for admin users page (Users.jsx)
+ * Service container for admin security page (SecurityManagement.jsx)
  * @extends {Container} unstated Container
  */
 export default class AdminUsersContainer extends Container {

src/server/views/admin/security.html

@@ -16,7 +16,7 @@
     <div class="col-md-3">
       {% include './widget/menu.html' with {current: 'security'} %}
     </div>
-    <div id="generalSetting" class="col-md-9">
+    <div class="col-md-9" id="admin-security-setting">
 
       {% set smessage = req.flash('successMessage') %}
       {% if smessage.length %}
@@ -36,7 +36,7 @@
       </div>
       {% endif %}
 
-      <form action="/_api/admin/security/general" method="post" class="form-horizontal" role="form">
+      <form action="/_api/admin/security/general" method="post" class="form-horizontal" id="generalSetting" role="form">
         <fieldset>
         <legend class="alert-anchor">{{ t('security_settings') }}</legend>