Download as
Browse Code »

Commit 7a3d490d9d1cf452dee2d5f33fd534eaaeb8180d

Authored by Tallys Martins
2 parents 9678a750 1afe4c99
Exists in master and in 5 other branches fix_search_by_software_highlight_block, r4, refactor_software_info_365, stable, update_translations

Merge remote-tracking branch 'origin/communities_ratings_fix' into r4

Showing 6 changed files with 20 additions and 20 deletions   Show diff stats
db/migrate/20150814185902_add_people_benefited_and_saved_value_to_create_community_rating.rb 0 → 100644
  Diff comments   View file @7a3d490
... ... @@ -0,0 +1,11 @@
  1 +class AddPeopleBenefitedAndSavedValueToCreateCommunityRating < ActiveRecord::Migration
  2 + def up
  3 + add_column :community_ratings, :people_benefited, :integer
  4 + add_column :community_ratings, :saved_value, :decimal
  5 + end
  6 +
  7 + def down
  8 + remove_column :community_ratings, :people_benefited
  9 + remove_column :community_ratings, :saved_value
  10 + end
  11 +end
... ...
db/migrate/20150814185902_add_people_benefited_and_saved_value_to_create_community_rating_comment.rb
View file @9678a75
... ... @@ -1,11 +0,0 @@
1   -class AddPeopleBenefitedAndSavedValueToCreateCommunityRatingComment < ActiveRecord::Migration
2   - def up
3   - add_column :tasks, :people_benefited, :integer
4   - add_column :tasks, :saved_value, :decimal
5   - end
6   -
7   - def down
8   - remove_column :tasks, :people_benefited
9   - remove_column :tasks, :saved_value
10   - end
11   -end
lib/ext/comments.rb
View file @9678a75
... ... @@ -1,5 +0,0 @@
1   -require_dependency "comment"
2   -
3   -class Comment
4   - attr_accessible :people_benefited, :saved_value
5   -end
lib/ext/community_rating.rb 0 → 100644
  Diff comments   View file @7a3d490
... ... @@ -0,0 +1,5 @@
  1 +require_dependency "community_rating"
  2 +
  3 +class CommunityRating
  4 + attr_accessible :people_benefited, :saved_value
  5 +end
... ...
views/comments_extra_fields.html.erb
  Diff comments   View file @7a3d490
... ... @@ -10,12 +10,12 @@
10 10 <div class="comments-software-people-benefited">
11 11 <%= label_tag "comments_people_benefited", _("Number of Beneficiaries")%>
12 12 <span class="star-tooltip" title="Quantidade de pessoas beneficiadas com a utilização do software"></span>
13   - <%= text_field_tag "comments[people_benefited]", "" %>
  13 + <%= text_field_tag "community_rating[people_benefited]", "" %>
14 14 </div>
15 15  
16 16 <div class="comments-software-saved-values">
17 17 <%= label_tag "comments_saved_value", _("Saved resources")%>
18 18 <span class="star-tooltip" title="Valores em “Real” economizados com a utilização do software"></span>
19   - <%= text_field_tag "comments[saved_value]", "", :placeholder=>"R$"%>
  19 + <%= text_field_tag "community_rating[saved_value]", "", :placeholder=>"R$"%>
20 20 </div>
21 21 </div>
... ...
views/communities_ratings_extra_fields_show_data.html.erb
  Diff comments   View file @7a3d490
1 1 <div class="aditional-informations">
2 2 <div class="comments-people-benefited">
3   - <span>People benefited :</span> <%= user_rating.comment.people_benefited unless user_rating.comment.nil? %>
  3 + <span>People benefited :</span> <%= user_rating.people_benefited unless user_rating.nil? %>
4 4 </div>
5 5  
6 6 <div class="comments-saved-value">
7   - <span>Saved Value :</span> <%= user_rating.comment.saved_value unless user_rating.comment.nil? %>
  7 + <span>Saved Value :</span> <%= user_rating.saved_value unless user_rating.nil? %>
8 8 </div>
9 9 </div>
10 10  
... ...