Jelajahi Sumber

Merge pull request #753 from weseek/fix/bug-in-installer

Fix/bug in installer
Yuki Takei 7 tahun lalu
induk
melakukan
274a666a0b
1 mengubah file dengan 7 tambahan dan 9 penghapusan
  1. 7 9
      src/server/routes/installer.js

+ 7 - 9
src/server/routes/installer.js

@@ -41,9 +41,6 @@ module.exports = function(crowi, app) {
       var email = registerForm.email;
       var email = registerForm.email;
       var password = registerForm.password;
       var password = registerForm.password;
       var language = registerForm['app:globalLang'] || (req.language || 'en-US');
       var language = registerForm['app:globalLang'] || (req.language || 'en-US');
-      // for config.globalLang setting.
-      var langForm = {};
-      langForm['app:globalLang'] = language;
 
 
       User.createUserByEmailAndPassword(name, username, email, password, language, function(err, userData) {
       User.createUserByEmailAndPassword(name, username, email, password, language, function(err, userData) {
         if (err) {
         if (err) {
@@ -56,9 +53,15 @@ module.exports = function(crowi, app) {
           Config.applicationInstall(function(err, configs) {
           Config.applicationInstall(function(err, configs) {
             if (err) {
             if (err) {
               // TODO
               // TODO
-              return ;
+              console.log(err);
+              return;
             }
             }
 
 
+            // save the globalLang config, and update the config cache
+            Config.updateNamespaceByArray('crowi', {'app:globalLang': language}, function(err, config) {
+              Config.updateConfigCache('crowi', config);
+            });
+
             // login with passport
             // login with passport
             req.logIn(userData, (err) => {
             req.logIn(userData, (err) => {
               if (err) { return next() }
               if (err) { return next() }
@@ -72,11 +75,6 @@ module.exports = function(crowi, app) {
           // create initial pages
           // create initial pages
           createInitialPages(userData, language);
           createInitialPages(userData, language);
         });
         });
-
-        // save config settings, and update config cache
-        Config.updateNamespaceByArray('crowi', langForm, function(err, config) {
-          Config.updateConfigCache('crowi', config);
-        });
       });
       });
     }
     }
     else {
     else {