Merge pull request #75 from nukosuke/pr-already-installed-redirect

Change behavior of applicationNotInstalled middleware

lib/util/middlewares.js

@@ -161,7 +161,8 @@ exports.applicationNotInstalled = function() {
     var config = req.config;
 
     if (Object.keys(config.crowi).length !== 1) {
-      return res.render('500', { error: 'Application already installed.' });
+      req.flash('errorMessage', 'Application already installed.');
+      return res.redirect('admin'); // admin以外はadminRequiredで'/'にリダイレクトされる
     }
 
     return next();

lib/views/admin/index.html

@@ -12,6 +12,14 @@
 
 {% block content_main %}
 <div class="content-main">
+  
+  {% set emessage = req.flash('errorMessage') %}
+  {% if emessage.length %}
+  <div class="alert alert-danger">
+    {{ emessage }}
+  </div>
+  {% endif %}
+
   <div class="row">
     <div class="col-md-3">
       <ul class="nav nav-pills nav-stacked">