From d9c3be28655e69d77a0f9aeba6a3a50da24eea4f Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Tue, 27 Jan 2015 19:51:12 -0200 Subject: [PATCH] Fix protocal in generated links --- app/helpers/application_helper.rb | 3 ++- app/helpers/tinymce_helper.rb | 2 +- app/models/environment.rb | 4 ++-- app/views/enterprise_registration/basic_information.html.erb | 2 +- app/views/layouts/application-ng.html.erb | 2 +- app/views/layouts/application.html.erb | 2 +- plugins/bsc/views/shared/_fields.html.erb | 2 +- public/designs/themes/noosfero/site_title.html.erb | 2 +- public/designs/themes/profile-base/site_title.html.erb | 4 ++-- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 22ec90c..8dde451 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -862,8 +862,9 @@ module ApplicationHelper end def base_url - environment.top_url + environment.top_url(request.scheme) end + alias :top_url :base_url def helper_for_article(article) article_helper = ActionView::Base.new diff --git a/app/helpers/tinymce_helper.rb b/app/helpers/tinymce_helper.rb index 65432c2..cf17f94 100644 --- a/app/helpers/tinymce_helper.rb +++ b/app/helpers/tinymce_helper.rb @@ -11,7 +11,7 @@ module TinymceHelper end def tinymce_init_js options = {} - options.merge! :document_base_url => environment.top_url, + options.merge! :document_base_url => top_url, :content_css => "/stylesheets/tinymce.css,#{macro_css_files}", :plugins => %w[compat3x advlist autolink lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualblocks visualchars code fullscreen diff --git a/app/models/environment.rb b/app/models/environment.rb index ee00db4..a45f3c2 100644 --- a/app/models/environment.rb +++ b/app/models/environment.rb @@ -657,8 +657,8 @@ class Environment < ActiveRecord::Base { :controller => 'admin_panel', :action => 'index' } end - def top_url - url = 'http://' + def top_url(scheme = 'http') + url = scheme + '://' url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname) url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port) url << Noosfero.root('') diff --git a/app/views/enterprise_registration/basic_information.html.erb b/app/views/enterprise_registration/basic_information.html.erb index 67db9e7..e00b036 100644 --- a/app/views/enterprise_registration/basic_information.html.erb +++ b/app/views/enterprise_registration/basic_information.html.erb @@ -20,7 +20,7 @@ <%= labelled_form_for :create_enterprise do |f| %> <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %> - <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %> + <%= required labelled_form_field(_('Address'), content_tag('code', top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %> <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %> <%= required labelled_form_field(_('Region'), f.select('region_id', @regions)) if @validation == :region %> diff --git a/app/views/layouts/application-ng.html.erb b/app/views/layouts/application-ng.html.erb index 6afe146..90e4829 100644 --- a/app/views/layouts/application-ng.html.erb +++ b/app/views/layouts/application-ng.html.erb @@ -14,7 +14,7 @@ - + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index dc95b04..34b6ce4 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -68,7 +68,7 @@