remove

Author: hiifong

modules/templates/helper.go

@@ -267,7 +267,7 @@ func userThemeName(ctx context.Context, user *user_model.User) string {
 	if user == nil || user.Theme == "" {
 		return setting.UI.DefaultTheme
 	}
-	if webtheme.IsThemeAvailable(ctx, user.Theme) {
+	if webtheme.IsThemeAvailable(user.Theme) {
 		return user.Theme
 	}
 	return setting.UI.DefaultTheme

routers/web/user/setting/profile.go

@@ -339,8 +339,8 @@ func Appearance(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("settings.appearance")
 	ctx.Data["PageIsSettingsAppearance"] = true
 
-	allThemes := webtheme.GetAvailableThemes(ctx)
-	if webtheme.IsThemeAvailable(ctx, setting.UI.DefaultTheme) {
+	allThemes := webtheme.GetAvailableThemes()
+	if webtheme.IsThemeAvailable(setting.UI.DefaultTheme) {
 		allThemes = util.SliceRemoveAll(allThemes, setting.UI.DefaultTheme)
 		allThemes = append([]string{setting.UI.DefaultTheme}, allThemes...) // move the default theme to the top
 	}
@@ -374,7 +374,7 @@ func UpdateUIThemePost(ctx *context.Context) {
 		return
 	}
 
-	if !webtheme.IsThemeAvailable(ctx, form.Theme) {
+	if !webtheme.IsThemeAvailable(form.Theme) {
 		ctx.Flash.Error(ctx.Tr("settings.theme_update_error"))
 		ctx.Redirect(setting.AppSubURL + "/user/settings/appearance")
 		return

services/webtheme/webtheme.go

@@ -4,7 +4,6 @@
 package webtheme
 
 import (
-	"context"
 	"sort"
 	"strings"
 	"sync"
@@ -64,12 +63,12 @@ func initThemes() {
 	}
 }
 
-func GetAvailableThemes(ctx context.Context) []string {
+func GetAvailableThemes() []string {
 	themeOnce.Do(initThemes)
 	return availableThemes
 }
 
-func IsThemeAvailable(ctx context.Context, name string) bool {
+func IsThemeAvailable(name string) bool {
 	themeOnce.Do(initThemes)
 	return availableThemesSet.Contains(name)
 }

templates/user/settings/appearance.tmpl

@@ -18,7 +18,7 @@
 					<label>{{ctx.Locale.Tr "settings.ui"}}</label>
 					<select name="theme" class="ui dropdown">
 						{{range $theme := .AllThemes}}
-						<option value="{{$theme}}" {{Iif (eq ($.SignedUser.GetTheme ctx) $theme) "selected"}}>{{$theme}}</option>
+						<option value="{{$theme}}" {{Iif (eq $.SignedUser.Theme $theme) "selected"}}>{{$theme}}</option>
 						{{end}}
 					</select>
 				</div>