Merge pull request #78 from jessib/finish_removing_email_settings_references

Remove references to email_settings controller, which has been removed. ...

6 files changed, 6 insertions, 5 deletions

diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index b459545..157f1df 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -1,6 +1,7 @@
 - if admin?
   %ul.nav.nav-tabs
-    %li{:class => ("active" if controller?('users', 'email_settings', 'overviews') || params[:user_id])}
+    = # this navigation isn't quite right. also, we will want to active for an identity controller once it is added.
+    %li{:class => ("active" if controller?('users', 'overviews') || params[:user_id])}
       = link_to t(:users), users_path
     %li{:class => ("active" if controller?('tickets') && !params[:user_id])}
       = link_to t(:tickets), tickets_path
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index 053c62c..b89655f 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -1,6 +1,7 @@
 %ul.nav.sidenav
   = link_to_navigation t(:overview), user_overview_path(@user), :active => controller?(:overviews)
   = link_to_navigation t(:account_settings), edit_user_path(@user), :active => controller?(:users)
+  - # will want link for identity settings
   = link_to_navigation t(:support_tickets), auto_tickets_path, :active => controller?(:tickets)
   = link_to_navigation t(:billing_settings), show_or_new_customer_link(@user), :active => controller?(:customer, :payments, :subscriptions, :credit_card_info) if APP_CONFIG[:payment].present?
   = link_to_navigation t(:logout), logout_path, :method => :delete
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