no need to introduce "unset"

Author: wxiaoguang

models/migrations/v1_23/v297.go

@@ -11,7 +11,7 @@ import (
 
 func AddRepoUnitEveryoneAccessMode(x *xorm.Engine) error {
 	type RepoUnit struct { //revive:disable-line:exported
-		EveryoneAccessMode perm.AccessMode `xorm:"NOT NULL DEFAULT -1"`
+		EveryoneAccessMode perm.AccessMode `xorm:"NOT NULL DEFAULT 0"`
 	}
 	return x.Sync(&RepoUnit{})
 }

models/perm/access_mode.go

@@ -14,9 +14,8 @@ import (
 type AccessMode int
 
 const (
-	AccessModeUnset AccessMode = -1 + iota // -1: no access mode is set
+	AccessModeNone AccessMode = iota // 0: no access
 
-	AccessModeNone  // 0:  no access
 	AccessModeRead  // 1: read access
 	AccessModeWrite // 2: write access
 	AccessModeAdmin // 3: admin access
@@ -26,8 +25,6 @@ const (
 // ToString returns the string representation of the access mode, do not make it a Stringer, otherwise it's difficult to render in templates
 func (mode AccessMode) ToString() string {
 	switch mode {
-	case AccessModeUnset:
-		return "unset"
 	case AccessModeRead:
 		return "read"
 	case AccessModeWrite:
@@ -49,8 +46,6 @@ func (mode AccessMode) LogString() string {
 func ParseAccessMode(permission string, allowed ...AccessMode) AccessMode {
 	m := AccessModeNone
 	switch permission {
-	case "unset":
-		m = AccessModeUnset
 	case "read":
 		m = AccessModeRead
 	case "write":

options/locale/locale_en-US.ini

@@ -885,7 +885,6 @@ repo_and_org_access = Repository and Organization Access
 permissions_public_only = Public only
 permissions_access_all = All (public, private, and limited)
 select_permissions = Select permissions
-permission_unset = (unset)
 permission_no_access = No Access
 permission_read = Read
 permission_write = Read and Write

routers/web/repo/setting/setting.go

@@ -480,7 +480,7 @@ func SettingsPost(ctx *context.Context) {
 				RepoID:             repo.ID,
 				Type:               unit_model.TypeWiki,
 				Config:             new(repo_model.UnitConfig),
-				EveryoneAccessMode: perm.ParseAccessMode(form.DefaultWikiEveryoneAccess, perm.AccessModeUnset, perm.AccessModeRead, perm.AccessModeWrite),
+				EveryoneAccessMode: perm.ParseAccessMode(form.DefaultWikiEveryoneAccess, perm.AccessModeNone, perm.AccessModeRead, perm.AccessModeWrite),
 			})
 			deleteUnitTypes = append(deleteUnitTypes, unit_model.TypeExternalWiki)
 		} else {

templates/repo/settings/options.tmpl

@@ -345,7 +345,7 @@
 						{{$unitBuiltinWiki := .Repository.MustGetUnit ctx $.UnitTypeWiki}}
 						<label>{{ctx.Locale.Tr "repo.settings.default_wiki_everyone_access"}}</label>
 						<select name="default_wiki_everyone_access" class="ui dropdown">
-							<option value="unset" {{Iif (eq $unitBuiltinWiki.EveryoneAccessMode -1) "selected"}}>{{ctx.Locale.Tr "settings.permission_unset"}}</option>
+							<option value="none" {{Iif (eq $unitBuiltinWiki.EveryoneAccessMode 0) "selected"}}>{{ctx.Locale.Tr "settings.permission_no_access"}}</option>
 							<option value="read" {{Iif (eq $unitBuiltinWiki.EveryoneAccessMode 1) "selected"}}>{{ctx.Locale.Tr "settings.permission_read"}}</option>
 							<option value="write" {{Iif (eq $unitBuiltinWiki.EveryoneAccessMode 2) "selected"}}>{{ctx.Locale.Tr "settings.permission_write"}}</option>
 						</select>