c_meyer/thingspeak
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Change clear channel to not do a find-all before deleting feeds.

Browse Source
This commit is contained in:
Alan Bradburne 2012-02-23 11:35:34 +00:00
parent 4f0354303f
commit 94b73faf85
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/channels_controller.rb
View File

@ -38,7 +38,7 @@ class ChannelsController < ApplicationController
# clear all data from a channel # clear all data from a channel
def clear def clear
channel = current_user.channels.find(params[:id]) channel = current_user.channels.find(params[:id])
channel.feeds.delete_all channel.delete_feeds
channel.update_attribute(:last_entry_id, nil) channel.update_attribute(:last_entry_id, nil)
redirect_to channels_path redirect_to channels_path

7
app/models/channel.rb
View File

@ -10,6 +10,7 @@ class Channel < ActiveRecord::Base
after_create :set_initial_default_name after_create :set_initial_default_name
before_validation :set_default_name before_validation :set_default_name
after_destroy :delete_feeds
validates :name, :presence => true, :on => :update validates :name, :presence => true, :on => :update
@ -22,7 +23,11 @@ class Channel < ActiveRecord::Base
end end
def field_label(field_number) def field_label(field_number)
self["field#{field_number}"] self.attributes["field#{field_number}"]
end
def delete_feeds
Feed.delete_all(["channel_id = ?", self.id])
end end
private private