coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable 'May Import Local Repository' when is disabled by setting (Issue #4779) (#4780)

This commit is contained in:
EnricoFerro 2018-08-24 07:00:22 +02:00 committed by techknowlogick
parent 194a11eb11
commit 0a24f5cac8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/templates/helper.go
View File

@ -165,6 +165,9 @@ func NewFuncMap() []template.FuncMap {
"DisableGitHooks": func() bool { "DisableGitHooks": func() bool {
return setting.DisableGitHooks return setting.DisableGitHooks
}, },
"DisableImportLocal": func() bool {
return !setting.ImportLocalPaths
},
"TrN": TrN, "TrN": TrN,
"Dict": func(values ...interface{}) (map[string]interface{}, error) { "Dict": func(values ...interface{}) (map[string]interface{}, error) {
if len(values)%2 != 0 { if len(values)%2 != 0 {

2
templates/admin/user/edit.tmpl
View File

@ -92,7 +92,7 @@
<div class="inline field"> <div class="inline field">
<div class="ui checkbox"> <div class="ui checkbox">
<label><strong>{{.i18n.Tr "admin.users.allow_import_local"}}</strong></label> <label><strong>{{.i18n.Tr "admin.users.allow_import_local"}}</strong></label>
<input name="allow_import_local" type="checkbox" {{if .User.CanImportLocal}}checked{{end}}> <input name="allow_import_local" type="checkbox" {{if .User.CanImportLocal}}checked{{end}} {{if DisableImportLocal}}disabled{{end}}>
</div> </div>
</div> </div>
{{if not .DisableRegularOrgCreation}} {{if not .DisableRegularOrgCreation}}