Replace cities#index with cities#forbes_index

TeaWithStrangers · Jun 6, 2015 · 92489f0 · 92489f0
1 parent 02d943e
commit 92489f0
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 51 deletions.
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -18,7 +18,7 @@
 @import "static/*";
 @import "cities/*";
 
-.sessions.new, .jfdi_signup, .forbes_index, .forbes_show {
+.sessions.new, .jfdi_signup, .cities.index, .forbes_show {
   @extend .light-background;
 }
 

diff --git a/app/controllers/cities_controller.rb b/app/controllers/cities_controller.rb
@@ -1,23 +1,10 @@
 class CitiesController < ApplicationController
-  before_action :set_city, except: [:index, :new, :forbes_index, :forbes_new, :forbes_create]
+  before_action :set_city, except: [:index, :new, :index, :forbes_new, :forbes_create]
   before_action :authenticate_user!, :authorized?, only: [:new, :create, :edit, :update, :destroy]
-  before_action :away_ye_waitlisted, except: [:forbes_index, :forbes_show, :forbes_new, :forbes_suggest, :forbes_create, :forbes_set_city]
+  before_action :away_ye_waitlisted, except: [:index, :forbes_show, :forbes_new, :forbes_suggest, :forbes_create, :forbes_set_city]
 
   # GET /cities
-  # GET /cities.json
   def index
-    if can? :manage, City
-      @cities = City.all
-      respond_to do |format|
-        format.html { render layout: !request.xhr? }
-        format.json { render json: @cities }
-      end
-    else
-      redirect_to root_path+"#cities"
-    end
-  end
-
-  def forbes_index
     use_new_styles
   end
 

diff --git a/app/views/cities/forbes_index.html.erb → app/views/cities/index.html.erb b/app/views/cities/forbes_index.html.erb → app/views/cities/index.html.erb
diff --git a/app/views/cities/index.html.haml b/app/views/cities/index.html.haml
diff --git a/config/routes.rb b/config/routes.rb
@@ -38,7 +38,6 @@
     end
   end
 
-  get '/cities' => 'cities#forbes_index'
   resources :cities do
     collection do
       get '/suggest'  => 'cities#forbes_new',     as: :suggest