[Git][noosfero/noosfero][master] 3 commits: Fix article initialize method

[Marcos Ronaldo Pereira Junior]

Marcos Ronaldo Pereira Junior pushed to branch master at Noosfero / noosfero


Commits:
560f0b22 by Tallys Martins at 2016-04-01T11:21:29-03:00
Fix article initialize method

Signed-off-by: Luciano Prestes <lucianopcbr at gmail.com>
Signed-off-by: Tallys Martins <tallysmartins at gmail.com>

- - - - -
cd5d929a by Marcos Ronaldo at 2016-04-01T11:21:29-03:00
Refactors article initialize method

- - - - -
5da12ce1 by Marcos Ronaldo Pereira Junior at 2016-04-01T18:13:59+00:00
Merge branch 'article_initialize_bug' into 'master'

Fix article initialize method

The initialize was breaking when the following command was given Folder.find_or_create_by_parent_id_and_name("Downloads"), returning the error: undefined method first for nil class when calling "params.first".

See merge request !834
- - - - -


1 changed file:

- app/models/article.rb


Changes:

=====================================
app/models/article.rb
=====================================
--- a/app/models/article.rb
+++ b/app/models/article.rb
@@ -28,17 +28,13 @@ class Article < ActiveRecord::Base
 
   def initialize(*params)
     super
-
-    if !params.blank?
-      if params.first.has_key?(:profile) && !params.first[:profile].blank?
-        profile = params.first[:profile]
-        self.published = false unless profile.public_profile
+    if params.present? && params.first.present?
+      if params.first.symbolize_keys.has_key?(:published)
+        self.published = params.first.symbolize_keys[:published]
+      elsif params.first[:profile].present? && !params.first[:profile].public_profile
+        self.published = false
       end
-
-      self.published = params.first["published"] if params.first.has_key?("published")
-      self.published = params.first[:published] if params.first.has_key?(:published)
     end
-
   end
 
   def self.default_search_display



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/12ab2e97c9699e8d7586ab16e370dfb6c2ef54bf...5da12ce195320e5c6492d84d8ea815726007f362
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160401/2e40422c/attachment-0001.html>