diff --git a/app/controllers/sites_controller.rb b/app/controllers/sites_controller.rb index 5deddd7..9db5a12 100644 --- a/app/controllers/sites_controller.rb +++ b/app/controllers/sites_controller.rb @@ -2,8 +2,13 @@ class SitesController < ApplicationController # GET /sites # GET /sites.json def index - @sites = Site.all + if params[:type_id].nil? or params[:type_id].empty? + @sites = Site.all + else + @sites = Type.find(params[:type_id]).sites + end + respond_to do |format| format.html # index.html.erb format.json { render json: @sites } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 64eb443..c38a748 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,6 +8,11 @@
+Type: - <%= @site.type_id %> + <%= @site.type.name if @site.type %>
diff --git a/config/routes.rb b/config/routes.rb index 6c766fb..4572a56 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,7 +1,12 @@ Planet::Application.routes.draw do - resources :sites + resources :sites + resources :types + + resources :types do + resources :sites + end get "planet/index"