diff --git a/pkg/controller/forum/add_edit.go b/pkg/controller/forum/add_edit.go index 0456cec..6e776d4 100644 --- a/pkg/controller/forum/add_edit.go +++ b/pkg/controller/forum/add_edit.go @@ -77,7 +77,6 @@ func AddEdit() http.HandlerFunc { // Sanity check admin-only settings -> default these to OFF. if !currentUser.HasAdminScope(config.ScopeForumAdmin) { isPrivileged = false - isPermitPhotos = false isPrivate = false } @@ -88,23 +87,23 @@ func AddEdit() http.HandlerFunc { models.NewFieldDiff("Description", forum.Description, description), models.NewFieldDiff("Category", forum.Category, category), models.NewFieldDiff("Explicit", forum.Explicit, isExplicit), + models.NewFieldDiff("PermitPhotos", forum.PermitPhotos, isPermitPhotos), } forum.Title = title forum.Description = description forum.Category = category forum.Explicit = isExplicit + forum.PermitPhotos = isPermitPhotos // Forum Admin-only options: if the current viewer is not a forum admin, do not change these settings. // e.g.: the front-end checkboxes are hidden and don't want to accidentally unset these! if currentUser.HasAdminScope(config.ScopeForumAdmin) { diffs = append(diffs, models.NewFieldDiff("Privileged", forum.Privileged, isPrivileged), - models.NewFieldDiff("PermitPhotos", forum.PermitPhotos, isPermitPhotos), models.NewFieldDiff("Private", forum.Private, isPrivate), ) forum.Privileged = isPrivileged - forum.PermitPhotos = isPermitPhotos forum.Private = isPrivate } diff --git a/web/templates/forum/add_edit.html b/web/templates/forum/add_edit.html index 3085f04..ae98a83 100644 --- a/web/templates/forum/add_edit.html +++ b/web/templates/forum/add_edit.html @@ -140,18 +140,16 @@

{{end}} - {{if .CurrentUser.HasAdminScope "admin.forum.manage"}}

- Check this box if the forum allows photos to be uploaded (not implemented) + Check this box if the forum allows photos to be uploaded.

- {{end}} {{if .CurrentUser.HasAdminScope "admin.forum.manage"}}