removed email settings controller and views

PGP setting has been moved into account settings. It's using the API now issueing an Ajax request without any visual feedback.

This obviously is not what we want but it hopefully suffices for uploading gpg keys for testing purposes before the Identity UI is in place.

2 files changed, 0 insertions, 44 deletions

diff --git a/users/app/controllers/email_settings_controller.rb b/users/app/controllers/email_settings_controller.rb
deleted file mode 100644
index f7d85be..0000000
--- a/users/app/controllers/email_settings_controller.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-class EmailSettingsController < UsersBaseController
-
-  before_filter :authorize
-  before_filter :fetch_user
-
-  def edit
-    @email_alias = LocalEmail.new
-  end
-
-  def update
-    @user.attributes = cleanup_params(params[:user])
-    if @user.changed?
-      if @user.save
-        flash[:notice] = t(:changes_saved)
-        redirect
-      else
-        if @user.email_aliases.last && !@user.email_aliases.last.valid?
-          # display bad alias in text field:
-          @email_alias = @user.email_aliases.pop
-        end
-        render 'email_settings/edit'
-      end
-    else
-      redirect
-    end
-  end
-
-  private
-
-  def redirect
-    redirect_to edit_user_email_settings_url(@user)
-  end
-
-  def cleanup_params(user)
-    if !user['email_forward'].nil? && user['email_forward'].empty?
-      user.delete('email_forward') # don't allow "" as an email forward
-    end
-    user
-  end
-
-end
diff --git a/users/app/controllers/v1/users_controller.rb b/users/app/controllers/v1/users_controller.rb
index fda56f2..467c9b4 100644
--- a/users/app/controllers/v1/users_controller.rb
+++ b/users/app/controllers/v1/users_controller.rb
@@ -24,9 +24,6 @@ module V1
 
     def update
       @user.update_attributes params[:user]
-      if @user.valid?
-        flash[:notice] = t(:user_updated_successfully)
-      end
       respond_with @user
     end