From 29eb24802965db25e572fb2e99290292f52970ed Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sleede.com>
Date: Mon, 2 Mar 2020 09:59:35 +0100
Subject: [PATCH] [bug] unable to select a group in profile completion screen

---
 CHANGELOG.md                                   | 1 +
 app/assets/templates/profile/complete.html.erb | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 623c2afce..a78064d6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
 - Fix a bug: logs are not printed in staging environment
 - Fix a bug: theme colors must be selected twice before the changes became effective
 - Fix a bug: datepicker does not work in profile completion screen
+- Fix a bug: unable to select a group in profile completion screen
 - Fix a security issue: updated loofah to fix [CVE-2019-15587](https://github.com/advisories/GHSA-c3gv-9cxf-6f57)
 - Fix a security issue: updated angular to 1.7.9 to fix [CVE-2019-10768](https://github.com/advisories/GHSA-89mq-4x47-5v83)
 - Fix a security issue: updated puma to 3.12.2 to fix [GHSA-7xx3-m584-x994](https://github.com/advisories/GHSA-7xx3-m584-x994)
diff --git a/app/assets/templates/profile/complete.html.erb b/app/assets/templates/profile/complete.html.erb
index 808ad0933..94bf1b082 100644
--- a/app/assets/templates/profile/complete.html.erb
+++ b/app/assets/templates/profile/complete.html.erb
@@ -77,10 +77,11 @@
                                                             <i class="fa fa-asterisk" aria-hidden="true"></i>
                                                           </span>
                                                         </span>
-                                                        <select ng-model="user.group_id" class="form-control" name="user[group_id]" required>
+                                                        <select ng-model="user.group_id" class="form-control" required>
                                                             <option value=null translate>{{ 'app.logged.profile_completion.your_user_s_profile' }}</option>
                                                             <option ng-repeat="group in groups" ng-value="group.id" ng-selected="group.id == user.group_id">{{group.name}}</option>
                                                         </select>
+                                                        <input type="hidden" name="user[group_id]" ng-value="user.group_id">
                                                     </div>
                                                     <span class="help-block" ng-show="userForm['user[group_id]'].$dirty && userForm['user[group_id]'].$error.required" translate>{{ 'app.logged.profile_completion.user_s_profile_is_required' }}</span>
                                                 </div>