Allow user to choose which email to be public

This commit allows user to show one of their emails in profile page,
or don't show email in this page.

1 files changed, 3 insertions, 1 deletions

diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb
index 4a65c978e5c..954c98c0d9f 100644
--- a/app/controllers/profiles/emails_controller.rb
+++ b/app/controllers/profiles/emails_controller.rb
@@ -3,6 +3,7 @@ class Profiles::EmailsController < ApplicationController
 
   def index
     @primary = current_user.email
+    @public_email = current_user.public_email
     @emails = current_user.emails
   end
 
@@ -19,7 +20,8 @@ class Profiles::EmailsController < ApplicationController
     @email.destroy
 
     current_user.set_notification_email
-    current_user.save if current_user.notification_email_changed?
+    current_user.set_public_email
+    current_user.save if current_user.notification_email_changed? or current_user.public_email_changed?
 
     respond_to do |format|
       format.html { redirect_to profile_emails_url }