noosfero | 3 new commits pushed to repository

[Antonio Terceiro]

Antonio Terceiro pushed to refs/heads/master at <a href="https://gitlab.com/noosfero/noosfero">Noosfero / noosfero</a>

Commits:
<a href="https://gitlab.com/noosfero/noosfero/commit/8cd9c0af76a639c27d287a9b6a605da892a2132b">8cd9c0af</a> by Parley Martins
Add subdirectory to link "Read more" on article block.

Signed-off-by: Fabio Teixeira <fabio1079 at gmail.com>
Signed-off-by: Parley Martins <parleypachecomartins at gmail.com>

- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/daa42a638a380eb7fc7b6422662a47ea6ca77a8d">daa42a63</a> by Parley Martins
Fix button of create new event

- - - - -
<a href="https://gitlab.com/noosfero/noosfero/commit/459640601c4be57f1035dfbabd9cc826fad08b88">45964060</a> by Antonio Terceiro
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

- - - - -


Changes:

=====================================
app/helpers/application_helper.rb
=====================================
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -945,9 +945,9 @@ module ApplicationHelper
   # from Article model for an ArticleBlock.
   def reference_to_article(text, article, anchor=nil)
     if article.profile.domains.empty?
-      href = "/#{article.url[:profile]}/"
+      href = "#{Noosfero.root}/#{article.url[:profile]}/"
     else
-      href = "http://#{article.profile.domains.first.name}/"
+      href = "http://#{article.profile.domains.first.name}#{Noosfero.root}/"
     end
     href += article.url[:page].join('/')
     href += '#' + anchor if anchor

=====================================
app/views/events/events.html.erb
=====================================
--- a/app/views/events/events.html.erb
+++ b/app/views/events/events.html.erb
@@ -3,7 +3,7 @@
 <div id='agenda-toolbar'>
   <%= button :back, _('Back to %s') % profile.name, profile.url %>
   <% if user && user.has_permission?('post_content', profile) %>
-    <%= button :new, _('New event'), myprofile_url(:controller => 'cms', :action => 'new', :type => 'Event') %>
+    <%= button :new, _('New event'), myprofile_path(:controller => 'cms', :action => 'new', :type => 'Event') %>
   <% end %>
 </div>
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150121/acfdd65c/attachment.html>