projects
/
feedcatcher.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added routes, display seems to work so long as you remove the forms from the views.
[feedcatcher.git]
/
app
/
controllers
/
feed_controller.rb
diff --git
a/app/controllers/feed_controller.rb
b/app/controllers/feed_controller.rb
index 819dab13c0dd344c376e38f73d544ba9a2fea61e..8e89663852aa502a7da8eead64a9726e22dc928c 100644
(file)
--- a/
app/controllers/feed_controller.rb
+++ b/
app/controllers/feed_controller.rb
@@
-1,9
+1,10
@@
class FeedController < ApplicationController
class FeedController < ApplicationController
-
+
skip_before_filter :verify_authenticity_token
def index
skip_before_filter :verify_authenticity_token
def index
- @feeds = FeedItem.find(:all, :select => 'DISTINCT feed_name')
+ # @feeds = FeedItem.find(:all, :select => 'DISTINCT feed_name')
+ @feeds = FeedItem.select(:feed_name).distinct
respond_to do |format|
format.html
format.rss { render :layout => false }
respond_to do |format|
format.html
format.rss { render :layout => false }
@@
-13,11
+14,11
@@
class FeedController < ApplicationController
def show
if FeedItem::valid_feed_name?(params[:feed_name])
def show
if FeedItem::valid_feed_name?(params[:feed_name])
- @feed_items = FeedItem.find_all_by_feed_name(params[:feed_name])
@feed_name = params[:feed_name]
@feed_name = params[:feed_name]
+ @feed_items = FeedItem.in_feed(@feed_name)
respond_to do |format|
if @feed_items == []
respond_to do |format|
if @feed_items == []
- flash[:notice] = "No items in feed #{
params[:feed_name]
}"
+ flash[:notice] = "No items in feed #{
@feed_name
}"
format.html { redirect_to index_url }
format.rss { render :layout => false }
else
format.html { redirect_to index_url }
format.rss { render :layout => false }
else
@@
-37,9
+38,9
@@
class FeedController < ApplicationController
def update
if FeedItem::valid_feed_name?(params[:feed_name])
def update
if FeedItem::valid_feed_name?(params[:feed_name])
- item = FeedItem.
find_by_feed_name_and_title(params[:feed_name], params[:title])
+ item = FeedItem.
in_feed(params[:feed_name]).entitled(params[:title]).take
if item
if item
- if params[:description]
== ''
+ if params[:description]
.empty?
destroy_item(item)
else
update_item(item)
destroy_item(item)
else
update_item(item)