Download as
Browse Code »

Commit 0c221480832ad764b75df96c1fef2a4cd8bd60b2

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

Modifies structure to fit communities_ratings_plugin 

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
Showing 6 changed files with 32 additions and 32 deletions   Show diff stats
db/migrate/20150814192230_add_institution_id_to_create_community_rating.rb 0 → 100644
  Diff comments   View file @0c22148
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
  1 +class AddInstitutionIdToCreateCommunityRating < 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
db/migrate/20150814192230_add_institution_id_to_create_community_rating_comment.rb
View file @4b1bc16
@@ -1,11 +0,0 @@ @@ -1,11 +0,0 @@
1 -class AddInstitutionIdToCreateCommunityRatingComment < ActiveRecord::Migration  
2 - def up  
3 - change_table :tasks do |t|  
4 - t.belongs_to :institution  
5 - end  
6 - end  
7 -  
8 - def down  
9 - remove_column :tasks, :institution_id  
10 - end  
11 -end  
lib/ext/comment.rb
View file @4b1bc16
@@ -1,18 +0,0 @@ @@ -1,18 +0,0 @@
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 0 → 100644
  Diff comments   View file @0c22148
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
  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
views/comments_extra_field.html.erb
  Diff comments   View file @0c22148
@@ -6,5 +6,5 @@ @@ -6,5 +6,5 @@
6 <%= content_tag(:div, _("No institution found"), 6 <%= content_tag(:div, _("No institution found"),
7 :id=>"institution_empty_ajax_message", 7 :id=>"institution_empty_ajax_message",
8 :class=>"errorExplanation hide-field") %> 8 :class=>"errorExplanation hide-field") %>
9 - <%= hidden_field_tag "comments[institution_id]", "", id: "institution_selected" %> 9 + <%= hidden_field_tag "community_rating[institution_id]", "", id: "institution_selected" %>
10 </div> 10 </div>
views/communities_ratings_extra_fields_show_institution.html.erb
  Diff comments   View file @0c22148
1 -<% if user_rating.comment and user_rating.comment.institution %> 1 +<% if user_rating.institution %>
2 <div class="aditional-informations"> 2 <div class="aditional-informations">
3 <div class="comments-user-institution"> 3 <div class="comments-user-institution">
4 - <span>Institution :<span> <%= user_rating.comment.institution.name unless user_rating.comment.nil? %> 4 + <span>Institution :<span> <%= user_rating.institution.name unless user_rating.institution.nil? %>
5 </div> 5 </div>
6 </div> 6 </div>
7 <% end %> 7 <% end %>