Fixed: assert url error when url prefix is empty

aosfather · Dec 15, 2019 · 0a49642 · 0a49642
1 parent 6392a90
commit 0a49642
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/modules/config/config.go b/modules/config/config.go
@@ -226,7 +226,10 @@ func (c Config) URLRemovePrefix(url string) string {
 	if url == c.prefix {
 		return "/"
 	}
-	return strings.Replace(url, c.Prefix(), "", 1)
+	if c.prefix == "/" {
+		return url
+	}
+	return strings.Replace(url, c.prefix, "", 1)
 }
 
 // Index return the index url without prefix.
@@ -245,6 +248,15 @@ func (c Config) Prefix() string {
 	return c.prefix
 }
 
+// AssertPrefix return the prefix of assert.
+func (c Config) AssertPrefix() string {
+	if c.prefix == "/" {
+		return ""
+	}
+	return c.prefix
+}
+
+
 // PrefixFixSlash return the prefix fix the slash error.
 func (c Config) PrefixFixSlash() string {
 	if c.UrlPrefix == "/" {

diff --git a/plugins/admin/controller/auth.go b/plugins/admin/controller/auth.go
@@ -67,7 +67,7 @@ func ShowLogin(ctx *context.Context) {
 		CdnUrl    string
 		System    types.SystemInfo
 	}{
-		UrlPrefix: config.Prefix(),
+		UrlPrefix: config.AssertPrefix(),
 		Title:     config.LoginTitle,
 		Logo:      config.LoginLogo,
 		System: types.SystemInfo{

diff --git a/template/login/login.tmpl b/template/login/login.tmpl
@@ -18,10 +18,10 @@
         <title>{{.Title}}</title>
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <link rel="stylesheet" href="{{.UrlPrefix}}/assets/login/dist/all.min.css">
+        <link rel="stylesheet" href="{{link .CdnUrl .UrlPrefix "/assets/login/dist/all.min.css"}}">
 
         <!--[if lt IE 9]>
-        <script src="{{.UrlPrefix}}/assets/login/dist/respond.min.js"></script>
+        <script src="{{link .CdnUrl .UrlPrefix "/assets/login/dist/respond.min.js"}}"></script>
         <![endif]-->
 
     </head>
@@ -62,7 +62,7 @@
         <canvas class="particles-js-canvas-el" width="1606" height="1862" style="width: 100%; height: 100%;"></canvas>
     </div>
 
-    <script src="{{.UrlPrefix}}/assets/login/dist/all.min.js"></script>
+    <script src="{{link .CdnUrl .UrlPrefix "/assets/login/dist/all.min.js"}}"></script>
 
     <script>
         $("#sign-up-form").submit(function (e) {

diff --git a/template/login/template.go b/template/login/template.go
@@ -20,10 +20,10 @@ var List = map[string]string{"login/theme1": `{{define "login_theme1"}}
         <title>{{.Title}}</title>
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <link rel="stylesheet" href="{{.UrlPrefix}}/assets/login/dist/all.min.css">
+        <link rel="stylesheet" href="{{link .CdnUrl .UrlPrefix "/assets/login/dist/all.min.css"}}">
 
         <!--[if lt IE 9]>
-        <script src="{{.UrlPrefix}}/assets/login/dist/respond.min.js"></script>
+        <script src="{{link .CdnUrl .UrlPrefix "/assets/login/dist/respond.min.js"}}"></script>
         <![endif]-->
 
     </head>
@@ -64,7 +64,7 @@ var List = map[string]string{"login/theme1": `{{define "login_theme1"}}
         <canvas class="particles-js-canvas-el" width="1606" height="1862" style="width: 100%; height: 100%;"></canvas>
     </div>
 
-    <script src="{{.UrlPrefix}}/assets/login/dist/all.min.js"></script>
+    <script src="{{link .CdnUrl .UrlPrefix "/assets/login/dist/all.min.js"}}"></script>
 
     <script>
         $("#sign-up-form").submit(function (e) {

diff --git a/template/types/page.go b/template/types/page.go
@@ -71,7 +71,7 @@ func NewPage(user models.UserModel, menu menu.Menu, panel Panel, cfg config.Conf
 		System: SystemInfo{
 			Version: system.Version(),
 		},
-		UrlPrefix:      cfg.Prefix(),
+		UrlPrefix:      cfg.AssertPrefix(),
 		Title:          cfg.Title,
 		Logo:           cfg.Logo,
 		MiniLogo:       cfg.MiniLogo,