فهرست منبع

Merge branch 'master' into feat/editor-navbar-buttons

utsushiiro 7 سال پیش
والد
کامیت
11a6730328
3فایلهای تغییر یافته به همراه58 افزوده شده و 62 حذف شده
  1. 45 49
      src/server/routes/installer.js
  2. 1 1
      src/server/views/admin/app.html
  3. 12 12
      src/server/views/admin/markdown.html

+ 45 - 49
src/server/routes/installer.js

@@ -1,15 +1,15 @@
 module.exports = function(crowi, app) {
   'use strict';
 
-  var debug = require('debug')('growi:routes:installer')
-    , path = require('path')
-    , fs = require('graceful-fs')
-    , models = crowi.models
-    , Config = models.Config
-    , User = models.User
-    , Page = models.Page
+  const logger = require('@alias/logger')('growi:routes:installer');
+  const path = require('path');
+  const fs = require('graceful-fs');
+  const models = crowi.models;
+  const Config = models.Config;
+  const User = models.User;
+  const Page = models.Page;
 
-    , actions = {};
+  const actions = {};
 
   function createInitialPages(owner, lang) {
     // create portal page for '/'
@@ -32,56 +32,52 @@ module.exports = function(crowi, app) {
     return res.render('installer');
   };
 
-  actions.createAdmin = function(req, res) {
-    var registerForm = req.body.registerForm || {};
+  actions.createAdmin = function(req, res, next) {
+    const registerForm = req.body.registerForm || {};
 
-    if (req.form.isValid) {
-      var name = registerForm.name;
-      var username = registerForm.username;
-      var email = registerForm.email;
-      var password = registerForm.password;
-      var language = registerForm['app:globalLang'] || (req.language || 'en-US');
-      // for config.globalLang setting.
-      var langForm = {};
-      langForm['app:globalLang'] = language;
+    if (!req.form.isValid) {
+      return res.render('installer');
+    }
 
-      User.createUserByEmailAndPassword(name, username, email, password, language, function(err, userData) {
-        if (err) {
-          req.form.errors.push('管理ユーザーの作成に失敗しました。' + err.message);
-          // TODO
-          return res.render('installer');
-        }
+    const name = registerForm.name;
+    const username = registerForm.username;
+    const email = registerForm.email;
+    const password = registerForm.password;
+    const language = registerForm['app:globalLang'] || 'en-US';
 
-        userData.makeAdmin(function(err, userData) {
-          Config.applicationInstall(function(err, configs) {
-            if (err) {
-              // TODO
-              return ;
-            }
+    User.createUserByEmailAndPassword(name, username, email, password, language, function(err, userData) {
+      if (err) {
+        req.form.errors.push('管理ユーザーの作成に失敗しました。' + err.message);
+        // TODO
+        return res.render('installer');
+      }
 
-            // login with passport
-            req.logIn(userData, (err) => {
-              if (err) { return next() }
-              else {
-                req.flash('successMessage', 'GROWI のインストールが完了しました!はじめに、このページで各種設定を確認してください。');
-                return res.redirect('/admin/app');
-              }
-            });
+      userData.makeAdmin(function(err, userData) {
+        Config.applicationInstall(function(err, configs) {
+          if (err) {
+            logger.error(err);
+            return;
+          }
+
+          // save the globalLang config, and update the config cache
+          Config.updateNamespaceByArray('crowi', {'app:globalLang': language}, function(err, config) {
+            Config.updateConfigCache('crowi', config);
           });
 
-          // create initial pages
-          createInitialPages(userData, language);
+          // login with passport
+          req.logIn(userData, (err) => {
+            if (err) { return next() }
+            else {
+              req.flash('successMessage', 'GROWI のインストールが完了しました!はじめに、このページで各種設定を確認してください。');
+              return res.redirect('/admin/app');
+            }
+          });
         });
 
-        // save config settings, and update config cache
-        Config.updateNamespaceByArray('crowi', langForm, function(err, config) {
-          Config.updateConfigCache('crowi', config);
-        });
+        // create initial pages
+        createInitialPages(userData, language);
       });
-    }
-    else {
-      return res.render('installer');
-    }
+    });
   };
 
   return actions;

+ 1 - 1
src/server/views/admin/app.html

@@ -63,7 +63,7 @@
           <label class="col-xs-3 control-label">{{ t('app_setting.Default Language for new users') }}</label>
           <div class="col-xs-6">
             <div class="radio radio-primary radio-inline">
-                <input type="radio" id="radioLangEn" name="settingForm[app:globalLang]" value="{{ consts.language.LANG_EN }}" {% if appGlobalLang() == consts.language.LANG_EN %}checked="checked"{% endif %}>
+                <input type="radio" id="radioLangEn" name="settingForm[app:globalLang]" value="{{ consts.language.LANG_EN_US }}" {% if appGlobalLang() == consts.language.LANG_EN_US %}checked="checked"{% endif %}>
                 <label for="radioLangEn">{{ t('English') }}</label>
             </div>
             <div class="radio radio-primary radio-inline">

+ 12 - 12
src/server/views/admin/markdown.html

@@ -102,8 +102,8 @@
           </label>
 
           <div class="col-xs-3 radio radio-primary">
-            <input type="radio" id="option1" name="{{nameForPageBreakOption}}" value="1" {% if pageBreakSeparator === 1 %}checked{% endif %}>
-            <label for="option1">
+            <input type="radio" id="pageBreakOption1" name="{{nameForPageBreakOption}}" value="1" {% if pageBreakSeparator === 1 %}checked{% endif %}>
+            <label for="pageBreakOption1">
               <p class="font-weight-bold">{{ t('markdown_setting.Preset one separator') }}</p>
               <p class="mt-3">
                 {{ t('markdown_setting.Preset one separator desc') }}
@@ -113,8 +113,8 @@
           </div>
 
           <div class="col-xs-3 radio radio-primary">
-            <input type="radio" id="option2" name="{{nameForPageBreakOption}}" value="2" {% if pageBreakSeparator === 2 %}checked{% endif %}>
-            <label for="option2">
+            <input type="radio" id="pageBreakOption2" name="{{nameForPageBreakOption}}" value="2" {% if pageBreakSeparator === 2 %}checked{% endif %}>
+            <label for="pageBreakOption2">
               <p class="font-weight-bold">{{ t('markdown_setting.Preset two separator') }}</p>
               <p class="mt-3">
                 {{ t('markdown_setting.Preset two separator desc') }}
@@ -124,8 +124,8 @@
           </div>
 
           <div class="col-xs-3 radio radio-primary">
-            <input type="radio" id="option3" name="{{nameForPageBreakOption}}" value="3" {% if pageBreakSeparator === 3 %}checked{% endif %}>
-            <label for="option3">
+            <input type="radio" id="pageBreakOption3" name="{{nameForPageBreakOption}}" value="3" {% if pageBreakSeparator === 3 %}checked{% endif %}>
+            <label for="pageBreakOption3">
               <p class="font-weight-bold">{{ t('markdown_setting.Custom separator') }}</p>
               <p class="mt-3">
                 {{ t('markdown_setting.Custom separator desc') }}
@@ -178,8 +178,8 @@
           {% set xssOption = markdownSetting['markdown:xss:option'] %}
 
           <div class="col-xs-4 radio radio-primary">
-            <input type="radio" id="option1" name="{{nameForXssOption}}" value="1" {% if xssOption === 1 %}checked{% endif %}>
-            <label for="option1">
+            <input type="radio" id="xssOption1" name="{{nameForXssOption}}" value="1" {% if xssOption === 1 %}checked{% endif %}>
+            <label for="xssOption1">
               <p class="font-weight-bold">{{ t('markdown_setting.Ignore all tags') }}</p>
               <div class="m-t-15">
                   {{ t('markdown_setting.Ignore all tags desc') }}
@@ -188,8 +188,8 @@
           </div>
 
           <div class="col-xs-4 radio radio-primary">
-            <input type="radio" id="option2" name="{{nameForXssOption}}" value="2" {% if xssOption === 2 %}checked{% endif %}>
-            <label for="option2">
+            <input type="radio" id="xssOption2" name="{{nameForXssOption}}" value="2" {% if xssOption === 2 %}checked{% endif %}>
+            <label for="xssOption2">
               <p class="font-weight-bold">{{ t('markdown_setting.Recommended setting') }}</p>
               <div class="m-t-15">
                 {{ t('markdown_setting.Tag names') }}
@@ -203,8 +203,8 @@
           </div>
 
           <div class="col-xs-4 radio radio-primary">
-            <input type="radio" id="option3" name="{{nameForXssOption}}" value="3" {% if xssOption === 3 %}checked{% endif %}>
-            <label for="option3">
+            <input type="radio" id="xssOption3" name="{{nameForXssOption}}" value="3" {% if xssOption === 3 %}checked{% endif %}>
+            <label for="xssOption3">
               <p class="font-weight-bold">{{ t('markdown_setting.Custom Whitelist') }}</p>
               <div class="m-t-15">
                 <div class="d-flex justify-content-between">