LetOnlyContributorsTrackTime -> AllowOnlyContributorsToTrackTime

go-gitea · Sep 30, 2019 · d90ae6a · d90ae6a
1 parent 967335e
commit d90ae6a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/integrations/api_repo_edit_test.go b/integrations/api_repo_edit_test.go
@@ -29,9 +29,9 @@ func getRepoEditOptionFromRepo(repo *models.Repository) *api.EditRepoOption {
 		config := unit.IssuesConfig()
 		hasIssues = true
 		internalTracker = &api.InternalTracker{
-			EnableTimeTracker:            config.EnableTimetracker,
-			LetOnlyContributorsTrackTime: config.AllowOnlyContributorsToTrackTime,
-			EnableIssueDependencies:      config.EnableDependencies,
+			EnableTimeTracker:                config.EnableTimetracker,
+			AllowOnlyContributorsToTrackTime: config.AllowOnlyContributorsToTrackTime,
+			EnableIssueDependencies:          config.EnableDependencies,
 		}
 	} else if unit, err := repo.GetUnit(models.UnitTypeExternalTracker); err == nil {
 		config := unit.ExternalTrackerConfig()
@@ -174,9 +174,9 @@ func TestAPIRepoEdit(t *testing.T) {
 		*repoEditOption.HasIssues = true
 		repoEditOption.ExternalTracker = nil
 		repoEditOption.InternalTracker = &api.InternalTracker{
-			EnableTimeTracker:            false,
-			LetOnlyContributorsTrackTime: false,
-			EnableIssueDependencies:      false,
+			EnableTimeTracker:                false,
+			AllowOnlyContributorsToTrackTime: false,
+			EnableIssueDependencies:          false,
 		}
 		*repoEditOption.HasWiki = true
 		repoEditOption.ExternalWiki = nil

diff --git a/models/repo.go b/models/repo.go
@@ -281,9 +281,9 @@ func (repo *Repository) innerAPIFormat(e Engine, mode AccessMode, isParent bool)
 		config := unit.IssuesConfig()
 		hasIssues = true
 		internalTracker = &api.InternalTracker{
-			EnableTimeTracker:            config.EnableTimetracker,
-			LetOnlyContributorsTrackTime: config.AllowOnlyContributorsToTrackTime,
-			EnableIssueDependencies:      config.EnableDependencies,
+			EnableTimeTracker:                config.EnableTimetracker,
+			AllowOnlyContributorsToTrackTime: config.AllowOnlyContributorsToTrackTime,
+			EnableIssueDependencies:          config.EnableDependencies,
 		}
 	} else if unit, err := repo.getUnit(e, UnitTypeExternalTracker); err == nil {
 		config := unit.ExternalTrackerConfig()

diff --git a/modules/structs/repo.go b/modules/structs/repo.go
@@ -21,7 +21,7 @@ type InternalTracker struct {
 	// Enable time tracking (Built-in issue tracker)
 	EnableTimeTracker bool `json:"enable_time_tracker"`
 	// Let only contributors track time (Built-in issue tracker)
-	LetOnlyContributorsTrackTime bool `json:"let_only_contributors_track_time"`
+	AllowOnlyContributorsToTrackTime bool `json:"allow_only_contributors_to_track_time"`
 	// Enable dependencies for issues and pull requests (Built-in issue tracker)
 	EnableIssueDependencies bool `json:"enable_issue_dependencies"`
 }

diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
@@ -699,7 +699,7 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
 			if opts.InternalTracker != nil {
 				config = &models.IssuesConfig{
 					EnableTimetracker:                opts.InternalTracker.EnableTimeTracker,
-					AllowOnlyContributorsToTrackTime: opts.InternalTracker.LetOnlyContributorsTrackTime,
+					AllowOnlyContributorsToTrackTime: opts.InternalTracker.AllowOnlyContributorsToTrackTime,
 					EnableDependencies:               opts.InternalTracker.EnableIssueDependencies,
 				}
 			} else if unit, err := repo.GetUnit(models.UnitTypeIssues); err != nil {

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
@@ -8991,6 +8991,11 @@
       "description": "InternalTracker represents settings for internal tracker",
       "type": "object",
       "properties": {
+        "allow_only_contributors_to_track_time": {
+          "description": "Let only contributors track time (Built-in issue tracker)",
+          "type": "boolean",
+          "x-go-name": "AllowOnlyContributorsToTrackTime"
+        },
         "enable_issue_dependencies": {
           "description": "Enable dependencies for issues and pull requests (Built-in issue tracker)",
           "type": "boolean",
@@ -9000,11 +9005,6 @@
           "description": "Enable time tracking (Built-in issue tracker)",
           "type": "boolean",
           "x-go-name": "EnableTimeTracker"
-        },
-        "let_only_contributors_track_time": {
-          "description": "Let only contributors track time (Built-in issue tracker)",
-          "type": "boolean",
-          "x-go-name": "LetOnlyContributorsTrackTime"
         }
       },
       "x-go-package": "code.gitea.io/gitea/modules/structs"