Merge branch 'visibility-level-text-admin-area' into 'master'

Fix visibility level texts on application settings Introduced by me through !2005 Before: ![Screenshot_from_2016-01-26_09-34-09](/uploads/fa3e8f2522a1d26372c7a06a81119e6f/Screenshot_from_2016-01-26_09-34-09.png) After: ![Screenshot_from_2016-01-26_09-34-27](/uploads/7955003dd02dd5376c9966aafdf4c50b/Screenshot_from_2016-01-26_09-34-27.png) See merge request !2611

Merge branch 'visibility-level-text-admin-area' into 'master'
a9aa97b7 · Douwe Maan · b227b9ad · c10296f9 · a9aa97b7 · a9aa97b7
Commit a9aa97b7 authored Jan 26, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

CHANGELOG CHANGELOG +1 -0

_form.html.haml app/views/admin/application_settings/_form.html.haml +2 -2

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ v 8.5.0 (unreleased)
  - Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel)
  - Don't vendor minified JS
  - Track project import failure
+  - Fix visibility level text in admin area (Zeger-Jan van de Weg)

 v 8.4.1
  - Apply security updates for Rails (4.2.5.1), rails-html-sanitizer (1.0.3),

--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -14,11 +14,11 @@
    .form-group.project-visibility-level-holder
      = f.label :default_project_visibility, class: 'control-label col-sm-2'
      .col-sm-10
-        = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project)
+        = render('shared/visibility_radios', model_method: :default_project_visibility, form: f, selected_level: @application_setting.default_project_visibility, form_model: Project.new)
    .form-group.project-visibility-level-holder
      = f.label :default_snippet_visibility, class: 'control-label col-sm-2'
      .col-sm-10
-        = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: PersonalSnippet)
+        = render('shared/visibility_radios', model_method: :default_snippet_visibility, form: f, selected_level: @application_setting.default_snippet_visibility, form_model: ProjectSnippet.new)
    .form-group
      = f.label :restricted_visibility_levels, class: 'control-label col-sm-2'
      .col-sm-10