Download as
Browse Code »

Commit a57217fbcfdb77d07c82c09ef5db2633ede41577

Authored by Weblate
2 parents c126ad06 e0ecc687
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

Merge remote-tracking branch 'origin/master'

Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
app/models/article.rb
  Diff comments   View file @a57217f
... ... @@ -767,7 +767,7 @@ class Article < ActiveRecord::Base
767 767 img.nil? ? '' : img.attributes['src']
768 768 end
769 769  
770   - delegate :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
  770 + delegate :lat, :lng, :region, :region_id, :environment, :environment_id, :to => :profile, :allow_nil => true
771 771  
772 772 def has_macro?
773 773 true
... ...
plugins/solr/lib/ext/article.rb
  Diff comments   View file @a57217f
... ... @@ -29,6 +29,7 @@ class Article
29 29 {:profile_id => :integer}, :language,
30 30 {:solr_plugin_category_filter => :integer},
31 31 # ordered/query-boosted fields
  32 + {:lat => :float}, {:lng => :float},
32 33 {:solr_plugin_name_sortable => :string}, :last_changed_by_id, :published_at, :is_image,
33 34 :updated_at, :created_at,
34 35 ], :include => [
... ...