Use emails instead of usernames when adding and listing organization's teachers

Author: Redande

app/controllers/teachers_controller.rb

@@ -15,11 +15,11 @@ def index
   def create
     authorize! :teach, @organization
 
-    user = User.find_by(login: teacher_params[:username])
+    user = User.find_by(email: teacher_params[:email])
     @teachership = Teachership.new(user: user, organization: @organization)
 
     if @teachership.save
-      redirect_to organization_teachers_path, notice: "Teacher #{user.login} added to organization"
+      redirect_to organization_teachers_path, notice: "Teacher #{user.email} added to organization"
     else
       @teachers = @organization.teachers
       render :index

app/views/teachers/_form.html.erb

@@ -4,8 +4,8 @@
   <%= render 'shared/error_messages', target: @teachership %>
 
   <div class="form-group">
-    <%= label nil, :username %>
-    <%= text_field_tag :username, nil, class: 'form-control' %>
+    <%= label nil, :email %>
+    <%= text_field_tag :email, nil, class: 'form-control' %>
   </div>
   <div class="actions">
     <%= submit_tag 'Add a new teacher', class: 'btn btn-primary' %>

app/views/teachers/index.html.erb

@@ -22,7 +22,7 @@
   <tbody>
   <% @teachers.each do |teacher| %>
     <tr>
-      <td><%= teacher.username %></td>
+      <td><%= teacher.email %></td>
       <td><%= link_to 'Remove', organization_teacher_path(@organization, teacher.teachership(@organization)), method: :delete, class: "btn btn-sm btn-danger", data: { confirm: 'Are you sure?' } %></td>
     </tr>
   <% end %>