diff options
| author | jacopo-beschi-intersail <jacopo.beschi@intersail.it> | 2016-11-14 16:11:55 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-11-18 14:39:29 +0300 |
| commit | 6b5aa83354b3dff903eb099bf03da733c36958fc (patch) | |
| tree | 6f5fb1773997cd60ded762f55007b4017e6c6e7b /app/views/admin/groups | |
| parent | 4e9b02c3e8174118c933e55aec3ddfd763c5984d (diff) | |
Fix Admin Links to new Group does not respect Default Visibility
Settings
This is done by passing a visibility_level option to the group edit _form.
The visibility_level is set to @group.visibility_level in edit ation and
to default_group_visibility in the new action.
Diffstat (limited to 'app/views/admin/groups')
| -rw-r--r-- | app/views/admin/groups/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/groups/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/groups/new.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/groups/_form.html.haml b/app/views/admin/groups/_form.html.haml index 817910f7ddf..589f4557b52 100644 --- a/app/views/admin/groups/_form.html.haml +++ b/app/views/admin/groups/_form.html.haml @@ -7,7 +7,7 @@ .col-sm-10 = render 'shared/choose_group_avatar_button', f: f - = render 'shared/visibility_level', f: f, visibility_level: @group.visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group + = render 'shared/visibility_level', f: f, visibility_level: visibility_level, can_change_visibility_level: can_change_group_visibility_level?(@group), form_model: @group .form-group .col-sm-offset-2.col-sm-10 diff --git a/app/views/admin/groups/edit.html.haml b/app/views/admin/groups/edit.html.haml index eb09a6328ed..c2b9807015d 100644 --- a/app/views/admin/groups/edit.html.haml +++ b/app/views/admin/groups/edit.html.haml @@ -1,4 +1,4 @@ - page_title "Edit", @group.name, "Groups" %h3.page-title Edit group: #{@group.name} %hr -= render 'form' += render 'form', visibility_level: @group.visibility_level diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml index c81ee552ac3..8f9fe96249f 100644 --- a/app/views/admin/groups/new.html.haml +++ b/app/views/admin/groups/new.html.haml @@ -1,4 +1,4 @@ - page_title "New Group" %h3.page-title New group %hr -= render 'form' += render 'form', visibility_level: default_group_visibility |