Redundant function removed and cron tasks disabling fixed

Removed redundant DisableSwagger; existing EnableSwagger is used instead.

Fixed disabling registerRewriteAllPublicKeys and registerRewriteAllPrincipalKeys cron tasks.

Author-Change-Id: IB#1105071

Author: pboguslawski

modules/cron/tasks_extended.go

@@ -121,10 +121,12 @@ func initExtendedTasks() {
 	registerDeleteInactiveUsers()
 	registerDeleteRepositoryArchives()
 	registerGarbageCollectRepositories()
-	if !setting.SSH.Disabled {
+	if !setting.SSH.Disabled && !setting.SSH.StartBuiltinServer && setting.SSH.CreateAuthorizedKeysFile {
 		registerRewriteAllPublicKeys()
 	}
-	registerRewriteAllPrincipalKeys()
+	if !setting.SSH.Disabled && !setting.SSH.StartBuiltinServer && setting.SSH.CreateAuthorizedPrincipalsFile {
+		registerRewriteAllPrincipalKeys()
+	}
 	if !setting.DisableGitHooks {
 		registerRepositoryUpdateHook()
 	}

modules/templates/helper.go

@@ -231,9 +231,6 @@ func NewFuncMap() []template.FuncMap {
 		"DisableSSH": func() bool {
 			return setting.SSH.Disabled
 		},
-		"DisableSwagger": func() bool {
-			return !setting.API.EnableSwagger
-		},
 		"DisableOAuth2": func() bool {
 			return !setting.OAuth2.Enable
 		},

templates/admin/dashboard.tmpl

@@ -35,18 +35,20 @@
 							<td>{{.i18n.Tr "admin.dashboard.git_gc_repos"}}</td>
 							<td><button type="submit" class="ui green button" name="op" value="git_gc_repos">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>
 						</tr>
-						{{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer)}}
+						{{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer) (.SSH.CreateAuthorizedKeysFile) }}
 						<tr>
 							<td>{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}}<br/>
 							{{.i18n.Tr "admin.dashboard.resync_all_sshkeys.desc"}}</td>
 							<td><button type="submit" class="ui green button" name="op" value="resync_all_sshkeys">{{svg "octicon-play"}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>
 						</tr>
 						{{end}}
+						{{if and (not .SSH.Disabled) (not .SSH.StartBuiltinServer) (.SSH.CreateAuthorizedPrincipalsFile) }}
 						<tr>
 							<td>{{.i18n.Tr "admin.dashboard.resync_all_sshprincipals"}}<br/>
 							{{.i18n.Tr "admin.dashboard.resync_all_sshprincipals.desc"}}</td>
 							<td><button type="submit" class="ui green button" name="op" value="resync_all_sshprincipals">{{svg "octicon-play" 16}} {{.i18n.Tr "admin.dashboard.operation_run"}}</button></td>
 						</tr>
+						{{end}}
 						{{if not DisableGitHooks}}
 						<tr>
 							<td>{{.i18n.Tr "admin.dashboard.resync_all_hooks"}}</td>

templates/user/settings/applications.tmpl

@@ -3,7 +3,7 @@
 	{{template "user/settings/navbar" .}}
 	<div class="ui container">
 		{{template "base/alert" .}}
-		{{if not DisableSwagger}}
+		{{if .EnableSwagger}}
 		<h4 class="ui top attached header">
 			{{.i18n.Tr "settings.manage_access_token"}}
 		</h4>

templates/user/settings/keys_principal.tmpl

@@ -1,12 +1,8 @@
-{{if .AllowPrincipals}}
+{{if and .AllowPrincipals (not DisableSSH)}}
 	<h4 class="ui top attached header">
 		{{.i18n.Tr "settings.manage_ssh_principals"}}
 		<div class="ui right">
-		{{if not .DisableSSH}}
 			<div class="ui blue tiny show-panel button" data-panel="#add-ssh-principal-panel">{{.i18n.Tr "settings.add_new_principal"}}</div>
-		{{else}}
-			<div class="ui blue tiny button disabled">{{.i18n.Tr "settings.ssh_disabled"}}</div>
-		{{end}}
 		</div>
 	</h4>
 	<div class="ui attached segment">

templates/user/settings/navbar.tmpl

@@ -8,7 +8,7 @@
 	<a class="{{if .PageIsSettingsSecurity}}active{{end}} item" href="{{AppSubUrl}}/user/settings/security">
 		{{.i18n.Tr "settings.security"}}
 	</a>
-	{{if or (not DisableSwagger) (not DisableOAuth2)}}
+	{{if or .EnableSwagger (not DisableOAuth2)}}
 		<a class="{{if .PageIsSettingsApplications}}active{{end}} item" href="{{AppSubUrl}}/user/settings/applications">
 			{{.i18n.Tr "settings.applications"}}
 		</a>