Yuto Iwata 7 лет назад
Родитель
Сommit
794203e722
2 измененных файлов с 18 добавлено и 19 удалено
  1. 12 5
      src/client/js/components/InstallerForm.js
  2. 6 14
      src/server/views/installer.html

+ 12 - 5
src/client/js/components/InstallerForm.js

@@ -5,10 +5,11 @@ import { translate } from 'react-i18next';
 class InstallerForm extends React.Component {
 class InstallerForm extends React.Component {
   render() {
   render() {
     return (
     return (
-      <div>
+      <form role="form" action="/installer/createAdmin" method="post" id="register-form">
         <div className="input-group" id="input-group-username">
         <div className="input-group" id="input-group-username">
           <span className="input-group-addon"><i className="icon-user"></i></span>
           <span className="input-group-addon"><i className="icon-user"></i></span>
-          <input type="text" className="form-control" placeholder={ this.props.t('User ID') } name="registerForm[username]" value={ this.props.userName } required />
+          <input type="text" className="form-control" placeholder={ this.props.t('User ID') }
+            name="registerForm[username]" defaultValue={this.props.userName} required />
         </div>
         </div>
         <p className="help-block">
         <p className="help-block">
           <span id="help-block-username"></span>
           <span id="help-block-username"></span>
@@ -16,12 +17,12 @@ class InstallerForm extends React.Component {
 
 
         <div className="input-group">
         <div className="input-group">
           <span className="input-group-addon"><i className="icon-tag"></i></span>
           <span className="input-group-addon"><i className="icon-tag"></i></span>
-          <input type="text" className="form-control" placeholder={ this.props.t('Name') } name="registerForm[name]" value={ this.props.name } required />
+          <input type="text" className="form-control" placeholder={ this.props.t('Name') } name="registerForm[name]" defaultValue={ this.props.name } required />
         </div>
         </div>
 
 
         <div className="input-group">
         <div className="input-group">
           <span className="input-group-addon"><i className="icon-envelope"></i></span>
           <span className="input-group-addon"><i className="icon-envelope"></i></span>
-          <input type="email" className="form-control" placeholder={ this.props.t('Email') } name="registerForm[email]" value={ this.props.email } required />
+          <input type="email" className="form-control" placeholder={ this.props.t('Email') } name="registerForm[email]" defaultValue={ this.props.email } required />
         </div>
         </div>
 
 
         <div className="input-group">
         <div className="input-group">
@@ -36,7 +37,13 @@ class InstallerForm extends React.Component {
             { this.props.t('Create') }
             { this.props.t('Create') }
           </button>
           </button>
         </div>
         </div>
-      </div>
+
+        <div className="input-group m-t-30 d-flex justify-content-center">
+          <a href="https://growi.org" className="link-growi-org">
+            <span className="growi">GROWI</span>.<span className="org">ORG</span>
+          </a>
+        </div>
+      </form>
     );
     );
   }
   }
 }
 }

+ 6 - 14
src/server/views/installer.html

@@ -54,20 +54,12 @@
         <small>{{ t('installer.current_language') }}: {{ appGlobalLang() }}</small>
         <small>{{ t('installer.current_language') }}: {{ appGlobalLang() }}</small>
       </p>
       </p>
 
 
-      <form role="form" action="/installer/createAdmin" method="post" id="register-form">
-        <div id='installer-form'
-          data-user-name="{{ req.body.registerForm.username }}"
-          data-name="{{ googleName|default(req.body.registerForm.name) }}"
-          data-email="{{ googleEmail|default(req.body.registerForm.email) }}"
-          data-csrf="{{ csrf() }}">
-        </div>
-
-        <div class="input-group m-t-30 d-flex justify-content-center">
-          <a href="https://growi.org" class="link-growi-org">
-            <span class="growi">GROWI</span>.<span class="org">ORG
-          </a>
-        </div>
-      </form>
+      <div id='installer-form'
+        data-user-name="{{ req.body.registerForm.username }}"
+        data-name="{{ googleName|default(req.body.registerForm.name) }}"
+        data-email="{{ googleEmail|default(req.body.registerForm.email) }}"
+        data-csrf="{{ csrf() }}">
+      </div>
     </div>
     </div>
 
 
   </div>{# /.row #}
   </div>{# /.row #}