summaryrefslogtreecommitdiff
path: root/users/app
diff options
context:
space:
mode:
authorazul <azul@riseup.net>2013-09-02 22:55:46 -0700
committerazul <azul@riseup.net>2013-09-02 22:55:46 -0700
commitc17edbc069c6dcfc3dd20d8cdfb5922032769a5f (patch)
tree719cdb3d4fd46b1e447262e4a29729513e4a08b1 /users/app
parentb69d37fcf00b7acfe1f35c3a6d79f244c5c28e01 (diff)
parent57baaa65cab56d13b77fff674a57e7f3e4983f00 (diff)
Merge pull request #78 from jessib/finish_removing_email_settings_references
Remove references to email_settings controller, which has been removed. ...
Diffstat (limited to 'users/app')
-rw-r--r--users/app/controllers/email_aliases_controller.rb2
-rw-r--r--users/app/views/overviews/show.html.haml2
2 files changed, 2 insertions, 2 deletions
diff --git a/users/app/controllers/email_aliases_controller.rb b/users/app/controllers/email_aliases_controller.rb
index 4628a7f..c90432f 100644
--- a/users/app/controllers/email_aliases_controller.rb
+++ b/users/app/controllers/email_aliases_controller.rb
@@ -6,7 +6,7 @@ class EmailAliasesController < UsersBaseController
if @user.save
flash[:notice] = t(:email_alias_destroyed_successfully, :alias => bold(@alias))
end
- redirect_to edit_user_email_settings_path(@user)
+ redirect_to edit_user_email_settings_path(@user) #TODO: this path doesn't exist. will want to add path for identities controller
end
end
diff --git a/users/app/views/overviews/show.html.haml b/users/app/views/overviews/show.html.haml
index 1cdcf02..d3409df 100644
--- a/users/app/views/overviews/show.html.haml
+++ b/users/app/views/overviews/show.html.haml
@@ -17,6 +17,6 @@
%ul.unstyled
%li= icon('user') + link_to(t(:overview_account), edit_user_path(@user))
- %li= icon('envelope') + link_to(t(:overview_email), edit_user_email_settings_path(@user))
+ - # %li= icon('envelope') + link_to(t(:overview_email), {insert path for user identities, presuambly}
%li= icon('question-sign') + link_to(t(:overview_tickets), user_tickets_path(@user))
%li= icon('shopping-cart') + link_to(t(:overview_billing), show_or_new_customer_link(@user)) if APP_CONFIG[:payment].present?