Download as
Browse Code »

Commit 158fd0a9856b142d440d2b48dc359395f1a42b78

Authored by Rodrigo Souto
1 parent 6d7a0824
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

versioned-article-view: use variabla and alert developers about doubled verification

Showing 1 changed file with 8 additions and 3 deletions   Show diff stats
app/views/content_viewer/versioned_article.rhtml
  Diff comments   View file @158fd0a
... ... @@ -15,11 +15,16 @@
15 15 <%= _("Version %{version} - %{author} on %{date}") % {:version => @version, :author => @page.author_name(@version), :date => show_time(@versioned_article.updated_at) } %>
16 16 </div>
17 17  
18   - <% if @page.version_license(@version).present? %>
  18 + <% version_license = @page.version_license(@version) %>
  19 + <%# This seemingly doubled verification exists because the article-sub-header
  20 + div must appear only if at least one content inside it will appeart.
  21 + Although we have only one content now, we might have others in the future.
  22 + So we're keeping it like that to avoid mistakes. %>
  23 + <% if version_license.present? %>
19 24 <div id='article-sub-header'>
20   - <% if @page.version_license(@version).present? %>
  25 + <% if version_license.present? %>
21 26 <div id="article-license">
22   - <%= _('Licensed under %s') % (@page.version_license(@version).url.present? ? link_to(@page.version_license(@version).name, @page.version_license(@version).url, :target => '_blank') : @page.version_license(@version).name) %>
  27 + <%= _('Licensed under %s') % (version_license.url.present? ? link_to(version_license.name, version_license.url, :target => '_blank') : version_license.name) %>
23 28 </div>
24 29 <% end %>
25 30 </div>
... ...