Download as
Browse Code »

Commit 8840541e75b416fe67a7d2d58f33162a3054a29c

Authored by Moises Machado
Committed by Daniela Feitosa
1 parent 29949cb4
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

ActionItem1071: made published images acts as images

Showing 6 changed files with 23 additions and 4 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @8840541
... ... @@ -20,6 +20,8 @@ class Article < ActiveRecord::Base
20 20  
21 21 settings_items :display_hits, :type => :boolean, :default => true
22 22  
  23 + belongs_to :reference_article, :class_name => "Article", :foreign_key => 'reference_article_id'
  24 +
23 25 before_create do |article|
24 26 article.published_at = article.created_at if article.published_at.nil?
25 27 end
... ...
app/models/folder.rb
  Diff comments   View file @8840541
... ... @@ -71,7 +71,8 @@ class Folder < Article
71 71  
72 72 has_many :images, :class_name => 'Article',
73 73 :foreign_key => 'parent_id',
74   - :order => 'type, name',
75   - :conditions => ['type = ? and content_type in (?) or type = ?', 'UploadedFile', UploadedFile.content_types, 'Folder']
  74 + :order => 'articles.type, articles.name',
  75 + :include => :reference_article,
  76 + :conditions => ["articles.type = 'UploadedFile' and articles.content_type in (?) or articles.type = 'Folder' or (articles.type = 'PublishedArticle' and reference_articles_articles.type = 'UploadedFile' and reference_articles_articles.content_type in (?))", UploadedFile.content_types, UploadedFile.content_types]
76 77  
77 78 end
... ...
app/models/published_article.rb
  Diff comments   View file @8840541
1 1 class PublishedArticle < Article
2   - belongs_to :reference_article, :class_name => "Article"
3   -
4 2 before_create do |article|
5 3 parent = article.reference_article.parent
6 4 if parent && parent.blog? && article.profile.has_blog?
... ...
app/views/content_viewer/_published_article.rhtml 0 → 100644
  Diff comments   View file @8840541
... ... @@ -0,0 +1,7 @@
  1 +<% article = published_article.reference_article %>
  2 +<% if article.image? %>
  3 + <div> <%= link_to image_tag(article.public_filename(:thumb)), article.view_url %> </div>
  4 +<% else %>
  5 + <%= render :partial => 'article', :object => article %>
  6 +<% end %>
  7 +
... ...
app/views/content_viewer/slideshow.rhtml
  Diff comments   View file @8840541
1 1 <p class='back-button' ><%= button('', _('Back to gallery'), @page.url)%></p>
2 2 <ul id='slideshow' >
3 3 <% @images.each do |img| -%>
  4 + <% img = img.reference_article if img.kind_of?(PublishedArticle) -%>
4 5 <% if img.image? -%>
5 6 <li><%= image_tag(url_for(img.public_filename(:display)), :title => (img.abstract.blank? ? img.name : img.abstract)) %></li>
6 7 <% end -%>
... ...
test/unit/folder_test.rb
  Diff comments   View file @8840541
... ... @@ -136,4 +136,14 @@ class FolderTest &lt; ActiveSupport::TestCase
136 136  
137 137 assert_equal [highlighted_t].map(&:slug), folder.news(2, true).map(&:slug)
138 138 end
  139 +
  140 + should 'return published images as images' do
  141 + p = create_user('test_user').person
  142 + i = UploadedFile.create!(:profile => p, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'))
  143 + c = Community.create!(:name => 'test_com')
  144 + folder = Folder.create!(:name => 'folder', :profile => c)
  145 + pi = PublishedArticle.create!(:profile => c, :reference_article => i, :parent => folder)
  146 +
  147 + assert_includes folder.images, pi
  148 + end
139 149 end
... ...