Download as
Browse Code »

Commit aa66130d0ade3adfcf754c65aa7461cf5207d892

Authored by Parley
Committed by Fabio Teixeira
1 parent 51542106
Exists in master and in 79 other branches add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev_env_minimal, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, prezento, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

New profile page to software 

Since Software is not a profile, a few adaptations were needed to print
its informations.
Showing 2 changed files with 35 additions and 19 deletions   Show diff stats
lib/ext/profile_helper.rb
  Diff comments   View file @aa66130
1 module ProfileHelper extend ProfileHelper 1 module ProfileHelper extend ProfileHelper
2 PERSON_CATEGORIES[:mpog_profile_information] = [:secondary_email, :institutions] 2 PERSON_CATEGORIES[:mpog_profile_information] = [:secondary_email, :institutions]
  3 +
  4 + def display_mpog_field(title, profile, field, force = false)
  5 + unless force || profile.may_display_field_to?(field, user)
  6 + return ''
  7 + end
  8 + value = profile.send(field)
  9 + if !value.blank?
  10 + if block_given?
  11 + value = yield(value)
  12 + end
  13 + content_tag('tr', content_tag('td', title, :class => 'field-name') + content_tag('td', value))
  14 + else
  15 + ''
  16 + end
  17 + end
  18 +
3 end 19 end
views/profile/_software_tab.html.erb
  Diff comments   View file @aa66130
@@ -4,21 +4,21 @@ @@ -4,21 +4,21 @@
4 <th colspan='2'><%= _('Software Information')%></th> 4 <th colspan='2'><%= _('Software Information')%></th>
5 </tr> 5 </tr>
6 6
7 - <%= display_field(_('Name:'), profile, :name, true) %> 7 + <%= display_mpog_field(_('Name:'), profile, :name, true) %>
8 <%= content_tag('tr', content_tag('td', _("Adherent to e_mag:")) + content_tag('td', profile.software_info.e_mag ? _("Yes") : _("No"))) %> 8 <%= content_tag('tr', content_tag('td', _("Adherent to e_mag:")) + content_tag('td', profile.software_info.e_mag ? _("Yes") : _("No"))) %>
9 <%= content_tag('tr', content_tag('td', _("Adherent to icp_brasil:")) + content_tag('td', profile.software_info.icp_brasil ? _("Yes") : _("No"))) %> 9 <%= content_tag('tr', content_tag('td', _("Adherent to icp_brasil:")) + content_tag('td', profile.software_info.icp_brasil ? _("Yes") : _("No"))) %>
10 <%= content_tag('tr', content_tag('td', _("Adherent to e_ping:")) + content_tag('td', profile.software_info.e_ping ? _("Yes") : _("No"))) %> 10 <%= content_tag('tr', content_tag('td', _("Adherent to e_ping:")) + content_tag('td', profile.software_info.e_ping ? _("Yes") : _("No"))) %>
11 <%= content_tag('tr', content_tag('td', _("Adherent to e_arq:")) + content_tag('td', profile.software_info.e_arq ? _("Yes") : _("No"))) %> 11 <%= content_tag('tr', content_tag('td', _("Adherent to e_arq:")) + content_tag('td', profile.software_info.e_arq ? _("Yes") : _("No"))) %>
12 <%= content_tag('tr', content_tag('td', _("Internacionalizable:")) + content_tag('td', profile.software_info.intern ? _("Yes") : _("No"))) %> 12 <%= content_tag('tr', content_tag('td', _("Internacionalizable:")) + content_tag('td', profile.software_info.intern ? _("Yes") : _("No"))) %>
13 - <%= display_field(_('Operating Platform:'), profile.software_info, :operating_platform, true) %>  
14 - <%= display_field(_('Demonstration URL:'), profile.software_info, :demonstration_url, true) %>  
15 - <%= display_field(_('Acronym:'), profile.software_info, :acronym, true) %>  
16 - <%= display_field(_('Objectives:'), profile.software_info, :objectives, true) %>  
17 - <%= display_field(_('Features:'), profile.software_info, :features, true) %> 13 + <%= display_mpog_field(_('Operating Platform:'), profile.software_info, :operating_platform, true) %>
  14 + <%= display_mpog_field(_('Demonstration URL:'), profile.software_info, :demonstration_url, true) %>
  15 + <%= display_mpog_field(_('Acronym:'), profile.software_info, :acronym, true) %>
  16 + <%= display_mpog_field(_('Objectives:'), profile.software_info, :objectives, true) %>
  17 + <%= display_mpog_field(_('Features:'), profile.software_info, :features, true) %>
18 18
19 <%= content_tag('tr', content_tag('td', _("License"))) %> 19 <%= content_tag('tr', content_tag('td', _("License"))) %>
20 - <%= display_field(_('Version:'), profile.software_info.license_info, :version, true) %>  
21 - <%= display_field(_('Link:'), profile.software_info.license_info, :link, true) %> 20 + <%= display_mpog_field(_('Version:'), profile.software_info.license_info, :version, true) %>
  21 + <%= display_mpog_field(_('Link:'), profile.software_info.license_info, :link, true) %>
22 </table> 22 </table>
23 23
24 <table> 24 <table>
@@ -33,9 +33,9 @@ @@ -33,9 +33,9 @@
33 <table class = "libraries-info dynamic-table"> 33 <table class = "libraries-info dynamic-table">
34 <%= content_tag('tr', content_tag('td', _("Libraries")) + content_tag('td', '')) %> 34 <%= content_tag('tr', content_tag('td', _("Libraries")) + content_tag('td', '')) %>
35 <% profile.software_info.libraries.each do |library| %> 35 <% profile.software_info.libraries.each do |library| %>
36 - <%= display_field(_('Name:'), library, :name, true) %>  
37 - <%= display_field(_('Version:'), library, :version, true) %>  
38 - <%= display_field(_('License:'), library, :license, true) %> 36 + <%= display_mpog_field(_('Name:'), library, :name, true) %>
  37 + <%= display_mpog_field(_('Version:'), library, :version, true) %>
  38 + <%= display_mpog_field(_('License:'), library, :license, true) %>
39 <% end %> 39 <% end %>
40 </table> 40 </table>
41 </td> 41 </td>
@@ -52,9 +52,9 @@ @@ -52,9 +52,9 @@
52 <table class = "database-info dynamic-table"> 52 <table class = "database-info dynamic-table">
53 <%= content_tag('tr', content_tag('td', _("Program Database")) + content_tag('td', '')) %> 53 <%= content_tag('tr', content_tag('td', _("Program Database")) + content_tag('td', '')) %>
54 <% profile.software_info.software_databases.each do |database| %> 54 <% profile.software_info.software_databases.each do |database| %>
55 - <%= display_field(_('Name:'), DatabaseDescription.find(database.database_description_id), :name, true) %>  
56 - <%= display_field(_('Version:'), database, :version, true) %>  
57 - <%= display_field(_('Operating System:'), database, :operating_system, true) %> 55 + <%= display_mpog_field(_('Name:'), DatabaseDescription.find(database.database_description_id), :name, true) %>
  56 + <%= display_mpog_field(_('Version:'), database, :version, true) %>
  57 + <%= display_mpog_field(_('Operating System:'), database, :operating_system, true) %>
58 <% end %> 58 <% end %>
59 </table> 59 </table>
60 </td> 60 </td>
@@ -71,9 +71,9 @@ @@ -71,9 +71,9 @@
71 <table class = "language-info dynamic-table"> 71 <table class = "language-info dynamic-table">
72 <%= content_tag('tr', content_tag('td', _("Programming Language")) + content_tag('td', '')) %> 72 <%= content_tag('tr', content_tag('td', _("Programming Language")) + content_tag('td', '')) %>
73 <% profile.software_info.software_languages.each do |language| %> 73 <% profile.software_info.software_languages.each do |language| %>
74 - <%= display_field(_('Name:'), language.programming_language , :name, true) %>  
75 - <%= display_field(_('Version:'), language, :version, true) %>  
76 - <%= display_field(_('Operating System:'), language, :operating_system, true) %> 74 + <%= display_mpog_field(_('Name:'), language.programming_language , :name, true) %>
  75 + <%= display_mpog_field(_('Version:'), language, :version, true) %>
  76 + <%= display_mpog_field(_('Operating System:'), language, :operating_system, true) %>
77 <% end %> 77 <% end %>
78 </table> 78 </table>
79 </td> 79 </td>
@@ -90,8 +90,8 @@ @@ -90,8 +90,8 @@
90 <table class = "operating-system-info dynamic-table"> 90 <table class = "operating-system-info dynamic-table">
91 <%= content_tag('tr', content_tag('td', _("Operating System")) + content_tag('td', '')) %> 91 <%= content_tag('tr', content_tag('td', _("Operating System")) + content_tag('td', '')) %>
92 <% profile.software_info.operating_systems.each do |operating_system| %> 92 <% profile.software_info.operating_systems.each do |operating_system| %>
93 - <%= display_field(_('Name:'), operating_system.operating_system_name , :name, true) %>  
94 - <%= display_field(_('Version:'), operating_system, :version, true) %> 93 + <%= display_mpog_field(_('Name:'), operating_system.operating_system_name , :name, true) %>
  94 + <%= display_mpog_field(_('Version:'), operating_system, :version, true) %>
95 <% end %> 95 <% end %>
96 </table> 96 </table>
97 </td> 97 </td>