X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=app%2Fcontrollers%2Ffeed_controller.rb;fp=app%2Fcontrollers%2Ffeed_controller.rb;h=30ddb0c6668cfdbe1bc12cfd26fd93ca15492de2;hb=f93204b41a8378389eb75b9215305fcc57145ac2;hp=2d6fee9786f62166fb4414cef8fa241c67c7f96c;hpb=3a164c47cd4f58ff8ee59446c73970d1b9b3fbbf;p=feedcatcher.git

diff --git a/app/controllers/feed_controller.rb b/app/controllers/feed_controller.rb
index 2d6fee9..30ddb0c 100644
--- a/app/controllers/feed_controller.rb
+++ b/app/controllers/feed_controller.rb
@@ -36,8 +36,8 @@ class FeedController < ApplicationController
 
 
   def update
-    if valid_feed_name?(params[:new_feed_name])
-      item = FeedItem.find_by_feed_name_and_title(params[:new_feed_name], params[:title])
+    if valid_feed_name?(params[:feed_name])
+      item = FeedItem.find_by_feed_name_and_title(params[:feed_name], params[:title])
       if item
         if params[:description] == ''
           destroy_item(item)
@@ -70,19 +70,19 @@ class FeedController < ApplicationController
 
 
   def create_item
-    item = FeedItem.new(:feed_name => params[:new_feed_name],
+    item = FeedItem.new(:feed_name => params[:feed_name],
       :title => params[:title],
       :description => params[:description])
     item.save!
     flash[:notice] = "Element #{params[:title]} created"
     respond_to do |format|
-      format.html { redirect_to feed_url(params[:new_feed_name]) }
+      format.html { redirect_to feed_url(params[:feed_name]) }
       format.rss  { head :ok }
     end
   rescue ActiveRecord::RecordInvalid => error
     flash[:notice] = "Element #{params[:title]} could not be created"
     respond_to do |format|
-      format.html { redirect_to feed_url(params[:new_feed_name]) }
+      format.html { redirect_to feed_url(params[:feed_name]) }
       format.rss  { head :unprocessable_entity }
     end
   end
@@ -92,13 +92,13 @@ class FeedController < ApplicationController
     if item.update_attribute(:description, params[:description])
       flash[:notice] = "Element #{params[:title]} updated"
       respond_to do |format|
-        format.html { redirect_to feed_url(params[:new_feed_name]) }
+        format.html { redirect_to feed_url(params[:feed_name]) }
         format.rss  { head :ok }
       end
     else
       flash[:notice] = "Element #{params[:title]} could not be updated"
       respond_to do |format|
-        format.html { redirect_to feed_url(params[:new_feed_name]) }
+        format.html { redirect_to feed_url(params[:feed_name]) }
         format.rss  { head :unprocessable_entity }
       end
     end
@@ -109,13 +109,13 @@ class FeedController < ApplicationController
     if item.destroy
       flash[:notice] = "Element #{params[:title]} destroyed"
       respond_to do |format|
-        format.html { redirect_to feed_url(params[:new_feed_name]) }
+        format.html { redirect_to feed_url(params[:feed_name]) }
         format.rss  { head :ok }
       end
     else
       flash[:notice] = "Element #{params[:title]} could not be destroyed"
       respond_to do |format|
-        format.html { redirect_to feed_url(params[:new_feed_name]) }
+        format.html { redirect_to feed_url(params[:feed_name]) }
         format.rss  { head :unprocessable_entity }
       end
     end