Download as
Browse Code »

Commit fa0a9ba753ebd4998f06075456711826b0a8be07

Authored by Leandro Santos
Committed by Rodrigo Souto
1 parent da3f08f8
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

API: adding more parameters as filter in conditions

Showing 1 changed file with 11 additions and 4 deletions   Show diff stats
lib/noosfero/api/helpers.rb
  Diff comments   View file @fa0a9ba
... ... @@ -2,6 +2,7 @@ module Noosfero
2 2 module API
3 3 module APIHelpers
4 4 PRIVATE_TOKEN_PARAM = :private_token
  5 + ALLOWED_PARAMETERS = ['parent_id', 'from', 'until', 'content_type']
5 6  
6 7 def logger
7 8 @logger ||= Logger.new(File.join(Rails.root, 'log', "#{ENV['RAILS_ENV']}_api.log"))
... ... @@ -52,15 +53,17 @@ module Noosfero
52 53 article = articles.find(id)
53 54 article.display_to?(current_user.person) ? article : forbidden!
54 55 end
55   -
  56 +
56 57 def make_conditions_with_parameter(params = {})
  58 + parsed_params = parser_params(params)
57 59 conditions = {}
58   - from_date = DateTime.parse(params[:from]) if params[:from]
59   - until_date = DateTime.parse(params[:until]) if params[:until]
  60 + from_date = DateTime.parse(parsed_params.delete('from')) if parsed_params['from']
  61 + until_date = DateTime.parse(parsed_params.delete('until')) if parsed_params['until']
60 62  
61   - conditions[:type] = parse_content_type(params[:content_type]) unless params[:content_type].nil?
  63 + conditions[:type] = parse_content_type(parsed_params.delete('content_type')) unless parsed_params['content_type'].nil?
62 64  
63 65 conditions[:created_at] = period(from_date, until_date) if from_date || until_date
  66 + conditions.merge!(parsed_params)
64 67  
65 68 conditions
66 69 end
... ... @@ -165,6 +168,10 @@ module Noosfero
165 168 end
166 169  
167 170 private
  171 +
  172 + def parser_params(params)
  173 + params.select{|k,v| ALLOWED_PARAMETERS.include?(k)}
  174 + end
168 175  
169 176 def default_limit
170 177 20
... ...