Merge pull request #774 from openstax/role-editing

Added field with dropdown for editing user roles
openstax · Mar 13, 2020 · 0bf25e0 · 0bf25e0
2 parents 61b39e6 + d6238d9
commit 0bf25e0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
@@ -118,6 +118,7 @@ def change_salesforce_contact
     def update_user
       @user.is_administrator = params[:user][:is_administrator]
       @user.is_test = params[:user][:is_test]
+      @user.role = params[:user][:role] if params[:user][:role]
       @user.faculty_status = params[:user][:faculty_status] if params[:user][:faculty_status]
       @user.school_type = params[:user][:school_type] if params[:user][:school_type]
       if @user.external_uuids.any? && params[:user][:keep_external_uuids] == '0'

diff --git a/app/views/admin/users/_form.html.erb b/app/views/admin/users/_form.html.erb
@@ -61,6 +61,14 @@
     </div>
   </div>
 
+  <div class="form-group">
+    <%= f.label :role, class: "col-sm-2 control-label" %>
+    <div class="col-sm-10">
+      <% roles = User.roles.keys.sort.map{ |key| [key.humanize, key] } %>
+      <%= f.select :role, roles, {:selected => @user.role}, {class: "form-control"} %>
+    </div>
+  </div>
+
   <div class="form-group">
     <%= f.label :faculty_status, class: "col-sm-2 control-label" %>
     <div class="col-sm-10">
@@ -237,5 +245,4 @@
 
   </div>
 
-
 <% end %>