Download as
Browse Code »

Commit 67f99b16dee00d34ba52c1446ce3748ba236ee86

Authored by Gabriela Navarro
1 parent 8f2bf863
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

software_search: Add the Any option for the select boxes. 

Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
Signed-off-by: Parley Martins <parley@outlook.com>
Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
lib/controlled_vocabulary_helper.rb
  Diff comments   View file @67f99b1
1 module ControlledVocabularyHelper 1 module ControlledVocabularyHelper
2 2
3 def self.get_categories_as_options 3 def self.get_categories_as_options
4 - categories = [] 4 + categories = ["<option>Any</option>".html_safe]
5 5
6 ControlledVocabulary.attribute_names.each do |attribute| 6 ControlledVocabulary.attribute_names.each do |attribute|
7 if attribute.to_s != "id" && attribute.to_s != "software_info_id" then 7 if attribute.to_s != "id" && attribute.to_s != "software_info_id" then
views/search/search_forms/_software_fields.html.erb
  Diff comments   View file @67f99b1
@@ -7,28 +7,28 @@ @@ -7,28 +7,28 @@
7 <tr> 7 <tr>
8 <td> <%= _("Database") %> </td> 8 <td> <%= _("Database") %> </td>
9 <td> 9 <td>
10 - <%= select_tag("database_description", SoftwareHelper.select_options(DatabaseDescription.all)) %> 10 + <%= collection_select(:database_description, :id, DatabaseDescription.all, :id, :name, :prompt=>_("Any")) %>
11 </td> 11 </td>
12 </tr> 12 </tr>
13 13
14 <tr> 14 <tr>
15 <td> <%= _("Programming Language") %> </td> 15 <td> <%= _("Programming Language") %> </td>
16 <td> 16 <td>
17 - <%= select_tag("programming_language", SoftwareHelper.select_options(ProgrammingLanguage.all)) %> 17 + <%= collection_select(:programming_language, :id, ProgrammingLanguage.all, :id, :name, :prompt=>_("Any")) %>
18 </td> 18 </td>
19 </tr> 19 </tr>
20 20
21 <tr> 21 <tr>
22 <td> <%= _("Operating System") %> </td> 22 <td> <%= _("Operating System") %> </td>
23 <td> 23 <td>
24 - <%= select_tag("operating_system", SoftwareHelper.select_options(OperatingSystemName.all)) %> 24 + <%= collection_select(:operating_system, :id, OperatingSystemName.all, :id, :name, :prompt=>_("Any")) %>
25 </td> 25 </td>
26 </tr> 26 </tr>
27 27
28 <tr> 28 <tr>
29 <td> <%= _("Controlled Vocabulary") %> </td> 29 <td> <%= _("Controlled Vocabulary") %> </td>
30 <td> 30 <td>
31 - <%= select_tag("controlled_vocabulary", ControlledVocabularyHelper.get_categories_as_options) %> 31 + <%= select_tag("controlled_vocabulary", (ControlledVocabularyHelper.get_categories_as_options)) %>
32 </td> 32 </td>
33 </tr> 33 </tr>
34 34