Download as
Browse Code »

Commit ce83a49bfef897e5abfefcd1793cd721fe935d84

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

add institution to community rating 

Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Showing 5 changed files with 41 additions and 6 deletions   Show diff stats
db/migrate/20150714123613_add_institution_to_community_rating.rb 0 → 100644
  Diff comments   View file @ce83a49
... ... @@ -0,0 +1,11 @@
  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/community_rating.rb 0 → 100644
  Diff comments   View file @ce83a49
... ... @@ -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
... ...
lib/institution.rb
  Diff comments   View file @ce83a49
1 1 class Institution < ActiveRecord::Base
  2 + has_many :community_ratings
  3 + alias :communities_ratings :community_ratings
  4 + alias :communities_ratings= :community_ratings=
2 5  
3 6 SEARCH_FILTERS = {
4 7 :order => %w[],
... ...
public/views/gov-user-comments-extra-fields.js
  Diff comments   View file @ce83a49
... ... @@ -5,11 +5,11 @@ modulejs.define(&quot;GovUserCommentsExtraFields&quot;, [&#39;jquery&#39;,&#39;CreateInstitution&#39;], fu
5 5 }
6 6  
7 7  
8   - function prepend_to_aditional_information() {
9   - var aditional_information = $(".comments-software-extra-fields");
10   - var institution_comments = $("#input_institution_comments");
  8 + function prepend_to_additional_information() {
  9 + var additional_information = $("#comments-additional-information");
  10 + var institution_comments = $("#input_institution_comments").remove();
11 11  
12   - aditional_information.prepend(institution_comments.remove());
  12 + institution_comments.insertAfter(additional_information);
13 13 }
14 14  
15 15  
... ... @@ -19,7 +19,7 @@ modulejs.define(&quot;GovUserCommentsExtraFields&quot;, [&#39;jquery&#39;,&#39;CreateInstitution&#39;], fu
19 19 },
20 20  
21 21 init: function() {
22   - prepend_to_aditional_information();
  22 + prepend_to_additional_information();
23 23 set_events();
24 24 }
25 25 }
... ...
views/comments_extra_field.html.erb
  Diff comments   View file @ce83a49
1 1 <div id="input_institution_comments">
2 2 <%= label_tag "input_institution", _("Organiztion name or Enterprise name")%>
3   - <%= text_field_tag "comments[instituton_name]", "", id: "input_institution" %>
  3 +
  4 + <input type="text" id="input_institution">
  5 +
4 6 <%= content_tag(:div, _("No institution found"),
5 7 :id=>"institution_empty_ajax_message",
6 8 :class=>"errorExplanation hide-field") %>
  9 + <%= hidden_field_tag "community_rating[institution_id]", "", id: "institution_selected" %>
7 10 </div>
... ...