From 9d99d340cfd3c55f21d38c1ba9f3f4574e40c46c Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Sun, 9 Dec 2012 13:19:54 +0100
Subject: basic form added to user settings, simple model created

---
 users/app/controllers/email_alias_controller.rb   | 36 ---------------------
 users/app/controllers/email_aliases_controller.rb | 39 +++++++++++++++++++++++
 2 files changed, 39 insertions(+), 36 deletions(-)
 delete mode 100644 users/app/controllers/email_alias_controller.rb
 create mode 100644 users/app/controllers/email_aliases_controller.rb

(limited to 'users/app/controllers')

diff --git a/users/app/controllers/email_alias_controller.rb b/users/app/controllers/email_alias_controller.rb
deleted file mode 100644
index 979c8ad..0000000
--- a/users/app/controllers/email_alias_controller.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-class EmailAliasesController < ApplicationController
-
-  before_filter :fetch_user
-
-  # get a list of email aliases for the given user?
-  def index
-    @aliases = @user.email_aliases
-    respond_with @aliases
-  end
-
-  def create
-    @alias = @user.add_email_alias(params[:email_alias])
-    flash[:notice] = t(:email_alias_created_successfully) unless @alias.errors
-    respond_with @alias
-  end
-
-  def update
-    @alias = @user.get_email_alias(params[:id])
-    @alias.set_email(params[:email_alias])
-    flash[:notice] = t(:email_alias_updated_successfully) unless @alias.errors
-    respond_with @alias
-  end
-
-  def destroy
-    @alias = @user.get_email_alias(params[:id])
-    flash[:notice] = t(:email_alias_destroyed_successfully)
-    @alias.destroy
-  end
-
-  protected
-
-  def fetch_user
-    @user = User.find_by_param(params[:user_id])
-    access_denied unless admin? or (@user == current_user)
-  end
-end
diff --git a/users/app/controllers/email_aliases_controller.rb b/users/app/controllers/email_aliases_controller.rb
new file mode 100644
index 0000000..751df85
--- /dev/null
+++ b/users/app/controllers/email_aliases_controller.rb
@@ -0,0 +1,39 @@
+class EmailAliasesController < ApplicationController
+
+  before_filter :fetch_user
+
+  respond_to :html
+
+  # get a list of email aliases for the given user?
+  def index
+    @aliases = @user.email_aliases
+    respond_with @aliases
+  end
+
+  def create
+    @alias = @user.add_email_alias(params[:email_alias])
+    flash[:notice] = t(:email_alias_created_successfully) unless @alias.errors
+    respond_with @alias, :location => edit_user_path(@user, :anchor => :email)
+  end
+
+  def update
+    @alias = @user.get_email_alias(params[:id])
+    @alias.set_email(params[:email_alias])
+    flash[:notice] = t(:email_alias_updated_successfully) unless @alias.errors
+    respond_with @alias, :location => edit_user_path(@user, :anchor => :email)
+  end
+
+  def destroy
+    @alias = @user.get_email_alias(params[:id])
+    flash[:notice] = t(:email_alias_destroyed_successfully)
+    @alias.destroy
+    redirect_to edit_user_path(@user, :anchor => :email)
+  end
+
+  protected
+
+  def fetch_user
+    @user = User.find_by_param(params[:user_id])
+    access_denied unless admin? or (@user == current_user)
+  end
+end
-- 
cgit v1.2.3