Download as
Browse Code »

Commit 459640601c4be57f1035dfbabd9cc826fad08b88

Authored by Antonio Terceiro
2 parents 1f3cc39f daa42a63
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 branch 'fix_block_links' into 'master' 

Fix block links

Fixing the URL from the article block and fixing the path of the New event button of the agenda.

When Noosfero is used in a subdirectory, it crashes without this modification.

See merge request !395
Showing 2 changed files with 3 additions and 3 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @4596406
@@ -945,9 +945,9 @@ module ApplicationHelper @@ -945,9 +945,9 @@ module ApplicationHelper
945 # from Article model for an ArticleBlock. 945 # from Article model for an ArticleBlock.
946 def reference_to_article(text, article, anchor=nil) 946 def reference_to_article(text, article, anchor=nil)
947 if article.profile.domains.empty? 947 if article.profile.domains.empty?
948 - href = "/#{article.url[:profile]}/" 948 + href = "#{Noosfero.root}/#{article.url[:profile]}/"
949 else 949 else
950 - href = "http://#{article.profile.domains.first.name}/" 950 + href = "http://#{article.profile.domains.first.name}#{Noosfero.root}/"
951 end 951 end
952 href += article.url[:page].join('/') 952 href += article.url[:page].join('/')
953 href += '#' + anchor if anchor 953 href += '#' + anchor if anchor
app/views/events/events.html.erb
  Diff comments   View file @4596406
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div id='agenda-toolbar'> 3 <div id='agenda-toolbar'>
4 <%= button :back, _('Back to %s') % profile.name, profile.url %> 4 <%= button :back, _('Back to %s') % profile.name, profile.url %>
5 <% if user && user.has_permission?('post_content', profile) %> 5 <% if user && user.has_permission?('post_content', profile) %>
6 - <%= button :new, _('New event'), myprofile_url(:controller => 'cms', :action => 'new', :type => 'Event') %> 6 + <%= button :new, _('New event'), myprofile_path(:controller => 'cms', :action => 'new', :type => 'Event') %>
7 <% end %> 7 <% end %>
8 </div> 8 </div>
9 9