Download as
Browse Code »

Commit 622e2512484398b8879f3ef8aa1903a5a3b6fc8b

Authored by Leandro Nunes dos Santos
1 parent 3183c63b
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

creating author_id method in article class to return the author id when the author exists

Showing 3 changed files with 16 additions and 1 deletions   Show diff stats
app/models/approve_article.rb
  Diff comments   View file @622e251
@@ -48,7 +48,7 @@ class ApproveArticle < Task @@ -48,7 +48,7 @@ class ApproveArticle < Task
48 end 48 end
49 49
50 def perform 50 def perform
51 - article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author.id) 51 + article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author_id)
52 end 52 end
53 53
54 def title 54 def title
app/models/article.rb
  Diff comments   View file @622e251
@@ -562,6 +562,10 @@ class Article < ActiveRecord::Base @@ -562,6 +562,10 @@ class Article < ActiveRecord::Base
562 author ? author.url : nil 562 author ? author.url : nil
563 end 563 end
564 564
  565 + def author_id
  566 + author ? author.id : nil
  567 + end
  568 +
565 alias :active_record_cache_key :cache_key 569 alias :active_record_cache_key :cache_key
566 def cache_key(params = {}, the_profile = nil, language = 'en') 570 def cache_key(params = {}, the_profile = nil, language = 'en')
567 active_record_cache_key+'-'+language + 571 active_record_cache_key+'-'+language +
test/unit/article_test.rb
  Diff comments   View file @622e251
@@ -1822,4 +1822,15 @@ class ArticleTest < ActiveSupport::TestCase @@ -1822,4 +1822,15 @@ class ArticleTest < ActiveSupport::TestCase
1822 assert_equal author_name, article.author_name 1822 assert_equal author_name, article.author_name
1823 end 1823 end
1824 1824
  1825 + should "author_id return the author id of the article's author" do
  1826 + author = fast_create(Person)
  1827 + article = Article.create!(:name => 'Test', :profile => profile, :last_changed_by => author)
  1828 + assert_equal author.id, article.author_id
  1829 + end
  1830 +
  1831 + should "author_id return nil if there is no article's author" do
  1832 + article = Article.create!(:name => 'Test', :profile => profile, :last_changed_by => nil)
  1833 + assert_nil article.author_id
  1834 + end
  1835 +
1825 end 1836 end