Fix MinInterval (#5856)

yasuokav · zeripath · commit 8510ac2687e7 · 2019-01-26T08:26:23.000Z
Fixes #5847
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
@@ -117,7 +117,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {
 		}
 
 		interval, err := time.ParseDuration(form.Interval)
-		if err != nil && (interval != 0 || interval < setting.Mirror.MinInterval) {
+		if err != nil || (interval != 0 && interval < setting.Mirror.MinInterval) {
 			ctx.RenderWithErr(ctx.Tr("repo.mirror_interval_invalid"), tplSettingsOptions, &form)
 		} else {
 			ctx.Repo.Mirror.EnablePrune = form.EnablePrune

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`interval, err := time.ParseDuration(form.Interval)`
`120`		`- if err != nil && (interval != 0 \|\| interval < setting.Mirror.MinInterval) {`
	`120`	`+ if err != nil \|\| (interval != 0 && interval < setting.Mirror.MinInterval) {`
`121`	`121`	`ctx.RenderWithErr(ctx.Tr("repo.mirror_interval_invalid"), tplSettingsOptions, &form)`
`122`	`122`	`} else {`
`123`	`123`	`ctx.Repo.Mirror.EnablePrune = form.EnablePrune`