Download as
Browse Code »

Commit 82748c1c6f34855c22e09bb10ad96be0b0172d53

Authored by Fabio Teixeira
1 parent ce3811d5
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

Replace institution_id from community_rating to comment 

Signed-off-by: Brenddon Gontijo <brenddongontijo@msn.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Showing 8 changed files with 68 additions and 70 deletions   Show diff stats
db/migrate/20150714123613_add_institution_to_comments.rb 0 → 100644
  Diff comments   View file @82748c1
... ... @@ -0,0 +1,11 @@
  1 +class AddInstitutionToComments < ActiveRecord::Migration
  2 + def up
  3 + change_table :comments do |t|
  4 + t.belongs_to :institution
  5 + end
  6 + end
  7 +
  8 + def down
  9 + remove_column :comments, :institution_id
  10 + end
  11 +end
... ...
db/migrate/20150714123613_add_institution_to_community_rating.rb
View file @ce3811d
... ... @@ -1,11 +0,0 @@
1   -class AddInstitutionToCommunityRating < ActiveRecord::Migration
2   - def up
3   - change_table :community_ratings do |t|
4   - t.belongs_to :institution
5   - end
6   - end
7   -
8   - def down
9   - remove_column :community_ratings, :institution_id
10   - end
11   -end
lib/ext/comment.rb 0 → 100644
  Diff comments   View file @82748c1
... ... @@ -0,0 +1,18 @@
  1 +require_dependency "comment"
  2 +
  3 +Comment.class_eval do
  4 + attr_accessible :institution_id
  5 +
  6 + belongs_to :institution
  7 +
  8 + validate :verify_institution
  9 +
  10 + private
  11 +
  12 + def verify_institution
  13 + if self.institution_id != nil
  14 + institution = Institution.find_by_id self.institution_id
  15 + self.errors.add :institution, _("not found") unless institution
  16 + end
  17 + end
  18 +end
... ...
lib/ext/community_rating.rb
View file @ce3811d
... ... @@ -1,18 +0,0 @@
1   -require_dependency "community_rating"
2   -
3   -CommunityRating.class_eval do
4   - attr_accessible :institution_id
5   -
6   - belongs_to :institution
7   -
8   - validate :verify_institution
9   -
10   - private
11   -
12   - def verify_institution
13   - if self.institution_id != nil
14   - institution = Institution.find_by_id self.institution_id
15   - self.errors.add :institution, _("not found") unless institution
16   - end
17   - end
18   -end
lib/institution.rb
  Diff comments   View file @82748c1
1 1 class Institution < ActiveRecord::Base
2   - has_many :community_ratings
3   - alias :communities_ratings :community_ratings
4   - alias :communities_ratings= :community_ratings=
  2 + has_many :comments
5 3  
6 4 SEARCH_FILTERS = {
7 5 :order => %w[],
... ...
test/unit/comment_test.rb 0 → 100644
  Diff comments   View file @82748c1
... ... @@ -0,0 +1,37 @@
  1 +require File.dirname(__FILE__) + '/../../../../test/test_helper'
  2 +require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
  3 +
  4 +class CommentTest < ActiveSupport::TestCase
  5 + include PluginTestHelper
  6 +
  7 + should "validate institution if there an institution_id" do
  8 + private_institution = build_private_institution "huehue", "hue", "11.222.333/4444-55"
  9 +
  10 + assert_equal true, private_institution.save
  11 +
  12 + comment = Comment.new :institution_id => 123456, :body => "simple body"
  13 + comment.valid?
  14 +
  15 + assert_equal true, comment.errors[:institution].include?("not found")
  16 +
  17 + comment.institution = private_institution
  18 + comment.valid?
  19 +
  20 + assert_equal false, comment.errors[:institution].include?("not found")
  21 + end
  22 +
  23 + private
  24 +
  25 + def build_private_institution name, corporate_name, cnpj, country="AR"
  26 + community = Community.new :name => name
  27 + community.country = country
  28 +
  29 + institution = PrivateInstitution.new :name=> name
  30 + institution.corporate_name = corporate_name
  31 + institution.cnpj = cnpj
  32 + institution.community = community
  33 +
  34 + institution
  35 + end
  36 +end
  37 +
... ...
test/unit/community_rating_test.rb
View file @ce3811d
... ... @@ -1,37 +0,0 @@
1   -require File.dirname(__FILE__) + '/../../../../test/test_helper'
2   -require File.dirname(__FILE__) + '/../helpers/plugin_test_helper'
3   -
4   -class CommunityRatingTest < ActiveSupport::TestCase
5   - include PluginTestHelper
6   -
7   - should "validate institution if there an institution_id" do
8   - private_institution = build_private_institution "huehue", "hue", "11.222.333/4444-55"
9   -
10   - assert_equal true, private_institution.save
11   -
12   - rating = CommunityRating.new :institution_id => 123456
13   - rating.valid?
14   -
15   - assert_equal true, rating.errors[:institution].include?("not found")
16   -
17   - rating.institution = private_institution
18   - rating.valid?
19   -
20   - assert_equal false, rating.errors[:institution].include?("not found")
21   - end
22   -
23   - private
24   -
25   - def build_private_institution name, corporate_name, cnpj, country="AR"
26   - community = Community.new :name => name
27   - community.country = country
28   -
29   - institution = PrivateInstitution.new :name=> name
30   - institution.corporate_name = corporate_name
31   - institution.cnpj = cnpj
32   - institution.community = community
33   -
34   - institution
35   - end
36   -end
37   -
views/comments_extra_field.html.erb
  Diff comments   View file @82748c1
... ... @@ -6,5 +6,5 @@
6 6 <%= content_tag(:div, _("No institution found"),
7 7 :id=>"institution_empty_ajax_message",
8 8 :class=>"errorExplanation hide-field") %>
9   - <%= hidden_field_tag "community_rating[institution_id]", "", id: "institution_selected" %>
  9 + <%= hidden_field_tag "comments[institution_id]", "", id: "institution_selected" %>
10 10 </div>
... ...