diff --git a/app/controllers/feeds_controller.rb b/app/controllers/feeds_controller.rb index 14d3a87..eb0d797 100644 --- a/app/controllers/feeds_controller.rb +++ b/app/controllers/feeds_controller.rb @@ -59,18 +59,8 @@ class FeedsController < ApplicationController end end - # DELETE /feeds/1 - # DELETE /feeds/1.json - # def destroy - # @feed = Feed.find(params[:id]) - # @feed.destroy - # - # respond_to do |format| - # format.html { redirect_to feeds_url, notice: 'Feed deleted OK' } - # format.json { head :no_content } - # end - # end - + # Feeds are never deleted. They're always retained in the DB. + def fetch @feed = Feed.find(params[:id]) @feed.fetch diff --git a/config/routes.rb b/config/routes.rb index 36fe669..64f4c23 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -2,12 +2,7 @@ Apollo::Application.routes.draw do get "logout" => "sessions#destroy", :as => "logout" get "login" => "sessions#new", :as => "login" - resources :layers do - member do - delete "delete_feed" - end - end - + resources :layers resources :users resources :sessions resources :password_resets