noosfero | 2 new commits pushed to repository

[Daniela Feitosa]

Daniela Feitosa pushed to refs/heads/master at <a href="https://gitlab.com/noosfero/noosfero">Noosfero / noosfero</a>

Commits:
<a href="https://gitlab.com/noosfero/noosfero/commit/980bcb819e852dbec6afc0c28b950f9693639f8e">980bcb81</a> by Daniela Feitosa
db/schema.rb: update

- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/87a25ade46aa48e9f962f684a2bae334ba0bb504">87a25ade</a> by Daniela Feitosa
external_feed: allow only_once to mass-assignment

Also removed "id" on update of external_feed_data. It must not be updated or
mass-assigned

- - - - -


Changes:

=====================================
app/models/blog.rb
=====================================
--- a/app/models/blog.rb
+++ b/app/models/blog.rb
@@ -53,7 +53,7 @@ class Blog < Folder
   def prepare_external_feed
     unless self.external_feed_data.nil?
       if self.external_feed(true) && self.external_feed.id == self.external_feed_data[:id].to_i
-        self.external_feed.attributes = self.external_feed_data
+        self.external_feed.attributes = self.external_feed_data.except(:id)
       else
         self.build_external_feed(self.external_feed_data, :without_protection => true)
       end

=====================================
app/models/external_feed.rb
=====================================
--- a/app/models/external_feed.rb
+++ b/app/models/external_feed.rb
@@ -10,7 +10,7 @@ class ExternalFeed < ActiveRecord::Base
     { :conditions => ['(fetched_at is NULL) OR (fetched_at < ?)', Time.now - FeedUpdater.update_interval] }
   }
 
-  attr_accessible :address, :enabled
+  attr_accessible :address, :enabled, :only_once
 
   def add_item(title, link, date, content)
     return if content.blank?

=====================================
db/schema.rb
=====================================
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140827191326) do
+ActiveRecord::Schema.define(:version => 20150113131617) do
 
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -149,6 +149,7 @@ ActiveRecord::Schema.define(:version => 20140827191326) do
     t.integer  "spam_comments_count",  :default => 0
     t.integer  "author_id"
     t.integer  "created_by_id"
+    t.boolean  "show_to_followers",    :default => false
   end
 
   add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"

=====================================
test/unit/external_feed_test.rb
=====================================
--- a/test/unit/external_feed_test.rb
+++ b/test/unit/external_feed_test.rb
@@ -176,4 +176,13 @@ class ExternalFeedTest < ActiveSupport::TestCase
 
   end
 
+  should 'allow mass assign attributes' do
+    p = create_user('testuser').person
+    blog = fast_create(Blog, :profile_id => p.id, :name => 'Blog test')
+
+    assert_difference 'ExternalFeed.count', 1 do
+      efeed = blog.create_external_feed(:address => 'http://invalid.url', :enabled => true, :only_once => 'false')
+    end
+  end
+
 end

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150123/331faaf9/attachment.html>