Download as
Browse Code »

Commit 778373b6408ac372cf915b06efae22171f698ed7

Authored by Daniela Feitosa
2 parents 9917c631 c7fedeb9
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Merge commit 'refs/merge-requests/16' of git://gitorious.org/noosfero/noosfero i… 

…nto merge-requests/16
Showing 2 changed files with 2 additions and 2 deletions   Show diff stats
app/views/cms/view.rhtml
  Diff comments   View file @778373b
... ... @@ -50,7 +50,7 @@
50 50 </td>
51 51 <td class="article-controls">
52 52 <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => article.id %>
53   - <%= button_without_text :eyes, _('Public view'), article.url %>
  53 + <%= button_without_text :eyes, _('Public view'), article.view_url %>
54 54 <%= display_spread_button(profile, article) unless article.folder? %>
55 55 <% if !environment.enabled?('cant_change_homepage') %>
56 56 <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %>
... ...
app/views/search/_article.rhtml
  Diff comments   View file @778373b
1 1 <li class="<%= icon_for_article(article) %>">
2   - <strong><%= link_to(article.title, article.url) %></strong>
  2 + <strong><%= link_to(article.title, article.view_url) %></strong>
3 3 <div class="item_meta">
4 4 <% if article.last_changed_by %>
5 5 <span class="cat_item_by">
... ...