Browse Source

Admin panel always require mysql

Vova Tkach 6 years ago
parent
commit
8f8d423381
2 changed files with 11 additions and 9 deletions
  1. 11 1
      engine/engine.go
  2. 0 8
      modules/modules.go

+ 11 - 1
engine/engine.go

@@ -1,7 +1,6 @@
 package engine
 
 import (
-	//"database/sql"
 	"net/http"
 	"os"
 	"strings"
@@ -57,7 +56,18 @@ func (this *Engine) Process() bool {
 
 	// Separated logic
 	if !this.Wrap.IsBackend {
+		// Render frontend
 		return this.Mods.XXXFrontEnd(this.Wrap)
 	}
+
+	// Backend must use MySQL anyway, so, check and connect
+	err := this.Wrap.UseDatabase()
+	if err != nil {
+		utils.SystemErrorPageEngine(this.Wrap.W, err)
+		return true
+	}
+	defer this.Wrap.DB.Close()
+
+	// Render backend
 	return this.Mods.XXXBackEnd(this.Wrap)
 }

+ 0 - 8
modules/modules.go

@@ -164,14 +164,6 @@ func (this *Modules) XXXBackEnd(wrap *wrapper.Wrapper) bool {
 	if mod != nil {
 		wrap.CurrModule = cm
 		if mod.Back != nil {
-			if mod.Info.WantDB {
-				err := wrap.UseDatabase()
-				if err != nil {
-					utils.SystemErrorPageEngine(wrap.W, err)
-					return true
-				}
-				defer wrap.DB.Close()
-			}
 			mod.Back(wrap)
 			return true
 		}