Download as
Browse Code »

Commit 11eaf495025a11223e3804839bf356f6c458e2b3

Authored by Larissa Reis
1 parent 9d0f27d3
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

stoa-plugin-tests: fixes person_api tests 

  attachment_fu doesn't provide #current_data for filesystem types of
  attachment anymore, so I added the method Image#current_data.

  Also fixes the column name that contains the tags' count for a sql
  query.
Showing 2 changed files with 4 additions and 1 deletions   Show diff stats
app/models/image.rb
  Diff comments   View file @11eaf49
... ... @@ -25,4 +25,7 @@ class Image < ActiveRecord::Base
25 25  
26 26 attr_accessible :uploaded_data
27 27  
  28 + def current_data
  29 + File.file?(full_filename) ? File.read(full_filename) : nil
  30 + end
28 31 end
... ...
plugins/stoa/lib/stoa_plugin/person_api.rb
  Diff comments   View file @11eaf49
... ... @@ -28,7 +28,7 @@ class StoaPlugin::PersonApi < Noosfero::FieldsDecorator
28 28 end
29 29  
30 30 def tags
31   - articles.published.tag_counts({:order => 'tags.count desc', :limit => 10}).inject({}) do |memo,tag|
  31 + articles.published.tag_counts({:order => 'count desc', :limit => 10}).inject({}) do |memo,tag|
32 32 memo[tag.name] = tag.count
33 33 memo
34 34 end
... ...