Download as
Browse Code »

Commit cddbff5b32ea1f7f204f93169fce897030a7760f

Authored by Antonio Terceiro
1 parent 4c5a5681
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

New logic for setting :port in development mode 

Now developers running on ports other than 3000 must inform their URL
options in config/url_options.yml
Showing 2 changed files with 10 additions and 10 deletions   Show diff stats
app/helpers/tags_helper.rb
  Diff comments   View file @cddbff5
... ... @@ -51,7 +51,7 @@ module TagsHelper
51 51 style = ""+
52 52 "font-size: #{ (v * delta).round + min_size }px;"+
53 53 "top: #{ -(delta/2) - (v * (delta/2)).round }px;"
54   - destination = url.kind_of?(Hash) ? url_for(url.merge(tagname_option => tag)) : (url.to_s + tag)
  54 + destination = url.merge(tagname_option => tag)
55 55  
56 56 if options[:show_count]
57 57 display_count = options[:show_count] ? "<small><sup>(#{count})</sup></small>" : ""
... ...
lib/noosfero.rb
  Diff comments   View file @cddbff5
... ... @@ -60,16 +60,16 @@ module Noosfero
60 60 end
61 61 end
62 62  
63   - # FIXME couldn't think of a way to test this.
64   - #
65   - # Works (tested by hand) on Rails 2.0.2, with mongrel. Should work with
66   - # webrick too.
67 63 def self.development_url_options
68   - if Object.const_defined?('OPTIONS')
69   - { :port => OPTIONS[:port ]}
70   - else
71   - {}
72   - end
  64 + @development_url_options ||=
  65 + begin
  66 + options = { :port => 3000 }
  67 + config = File.join(Rails.root, 'config', 'url_options.yml')
  68 + if File.exists?(config)
  69 + options.merge!(YAML.load_file(config).symbolize_keys)
  70 + end
  71 + options
  72 + end
73 73 end
74 74  
75 75  
... ...