Download as
Browse Code »

Commit 6bc02adcb21b59d363c97a731ae0eadd6558ef14

Authored by Parley
Committed by Fabio Teixeira
1 parent a8563d11
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

License Info added to new software view 

Signed-off-by: Parley Martins <parley@utlook.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Showing 2 changed files with 19 additions and 6 deletions   Show diff stats
controllers/mpog_software_plugin_myprofile_controller.rb
  Diff comments   View file @6bc02ad
@@ -19,11 +19,11 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -19,11 +19,11 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
19 #@list_databases = DatabaseHelper.list_database(params[:database]) 19 #@list_databases = DatabaseHelper.list_database(params[:database])
20 #@software_categories = SoftwareCategories::new params[:software_categories] 20 #@software_categories = SoftwareCategories::new params[:software_categories]
21 #@list_operating_systems = OperatingSystemHelper.list_operating_system(params[:operating_system]) 21 #@list_operating_systems = OperatingSystemHelper.list_operating_system(params[:operating_system])
22 - #@license_info = if params[:license_info].nil?  
23 - # LicenseInfo::new  
24 - #else  
25 - # LicenseInfo.find(:first, :conditions =>["version = ?","#{params[:license_info][:version]}"])  
26 - #end 22 + @license_info = if params[:license_info].nil?
  23 + LicenseInfo::new
  24 + else
  25 + LicenseInfo.find(:first, :conditions =>["version = ?","#{params[:license_info][:version]}"])
  26 + end
27 27
28 #if not @list_libraries.nil? 28 #if not @list_libraries.nil?
29 # @list_libraries.each do |library| 29 # @list_libraries.each do |library|
@@ -90,7 +90,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController @@ -90,7 +90,7 @@ class MpogSoftwarePluginMyprofileController &lt; MyProfileController
90 90
91 @errors |= @community.errors.full_messages 91 @errors |= @community.errors.full_messages
92 @errors |= @software_info.errors.full_messages 92 @errors |= @software_info.errors.full_messages
93 - # @errors |= @license_info.errors.full_messages 93 + @errors |= @license_info.errors.full_messages
94 # @errors |= @software_categories.errors.full_messages 94 # @errors |= @software_categories.errors.full_messages
95 #end 95 #end
96 end 96 end
views/mpog_software_plugin_myprofile/new_software.html.erb
  Diff comments   View file @6bc02ad
@@ -33,6 +33,19 @@ @@ -33,6 +33,19 @@
33 </div> 33 </div>
34 <% end %> 34 <% end %>
35 35
  36 + <%= fields_for @license_info do |lcv| %>
  37 + <div class="formfieldline">
  38 + <h4> <%= lcv.label _("License Version: ") %> </h4>
  39 + <%= lcv.select(:version, LicenseInfo.all.map {|l| [l.version, l.version]}, {:selected=>1}, :onchange => "get_license_link('license_info_version')") %>
  40 +
  41 + <h4> <%= _("License link") %> </h4>
  42 + <% LicenseHelper.getListLicenses.each do | license | %>
  43 + <input type="hidden" id = "version_<%=license.id %>" value = "<%=license.link%>">
  44 + <% end %>
  45 + <a id = "version_link" href="<%= LicenseInfo.first.link %>" target="_BLANK"> <%=LicenseInfo.first.link %> </a>
  46 +
  47 + </div>
  48 + <% end %>
36 <%= template_options(:communities, 'community')%> 49 <%= template_options(:communities, 'community')%>
37 50
38 <%= hidden_field_tag('back_to', @back_to) %> 51 <%= hidden_field_tag('back_to', @back_to) %>