From 57baaa65cab56d13b77fff674a57e7f3e4983f00 Mon Sep 17 00:00:00 2001 From: jessib Date: Mon, 2 Sep 2013 13:28:32 -0700 Subject: Remove references to email_settings controller, which has been removed. An identities controller will replace it. --- users/app/controllers/email_aliases_controller.rb | 2 +- users/app/views/overviews/show.html.haml | 2 +- users/config/locales/en.yml | 1 - users/config/routes.rb | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) (limited to 'users') 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? diff --git a/users/config/locales/en.yml b/users/config/locales/en.yml index 55ba3a1..b69f7f4 100644 --- a/users/config/locales/en.yml +++ b/users/config/locales/en.yml @@ -1,5 +1,4 @@ en: - email_settings: "Email Settings" account_settings: "Account Settings" logout: "Logout" none: "None" diff --git a/users/config/routes.rb b/users/config/routes.rb index 4fa185f..d4d5933 100644 --- a/users/config/routes.rb +++ b/users/config/routes.rb @@ -15,7 +15,7 @@ Rails.application.routes.draw do get "signup" => "users#new", :as => "signup" resources :users, :except => [:create, :update] do resource :overview, :only => [:show] - resource :email_settings, :only => [:edit, :update] + # resource :email_settings, :only => [:edit, :update] resources :email_aliases, :only => [:destroy], :id => /.*/ post 'deactivate', on: :member post 'enable', on: :member -- cgit v1.2.3