Download as
Browse Code »

Commit bf41911cfa54a02388055bb9b3720c20e3b51ff7

Authored by Tallys Martins
1 parent 7f8d5604
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

Fix for Software Catalog and removed unused unit test

Showing 2 changed files with 4 additions and 19 deletions   Show diff stats
test/unit/comments_test.rb
View file @7f8d560
... ... @@ -1,17 +0,0 @@
1   -require File.dirname(__FILE__) + '/../../../../test/test_helper'
2   -require File.dirname(__FILE__) + '/../../lib/ext/comments.rb'
3   -
4   -class CommentsTest < ActiveSupport::TestCase
5   -
6   - def teardown
7   - Comment.destroy_all
8   - end
9   -
10   - should 'create comments with new fields' do
11   - @person = fast_create(Person)
12   - @article = Article.create(:profile => @person, :name => "Test")
13   -
14   - comment = Comment.new(:body => "Comment new", :author => @person, :people_benefited => 2, :saved_value => 38.5)
15   - assert comment.save
16   - end
17   -end
views/search/_software_search_form.html.erb
  Diff comments   View file @bf41911
... ... @@ -12,10 +12,12 @@
12 12 <%= hidden_field_tag :filter, params[:filter] %>
13 13  
14 14 <%= labelled_radio_button _('Public Software'), :software_type, 'public_software', @public_software_selected, :id => "public_software_radio_button", :class => "project-software" %>
15   - <span class="doubts-catalog-software" title="<%= _('Public Software.') %>">?</span>
  15 + <span class="doubts-catalog-software" title="<%= _('Projects that have passed by the Avalia SPB process according to the requirements of IN 01/2011.') %>">?</span>
  16 + <!-- Projetos que passaram pelo processo do Avalia SPB de acordo com os requisitos da IN 01/2011. -->
16 17  
17 18 <%= labelled_radio_button _('All'), :software_type, 'all', @all_selected, :id => "all_radio_button", :class => "project-software" %>
18   - <span class="doubts-catalog-software" title="<%= _('All.') %>">?</span>
  19 + <span class="doubts-catalog-software" title="<%= _('Projects included in the portal as cases provided by the IN 01/2011.') %>">?</span>
  20 + <!-- Projetos incluídos no portal, conforme casos previstos na IN 01/2011. -->
19 21  
20 22 <div class="search-field">
21 23 <span class="formfield">
... ...