Download as
Browse Code »

Commit 5d91f910005a99f02438b2308a61770f414797f3

Authored by Leandro Santos
Committed by Antonio Terceiro
1 parent 061eb85d
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

fixing bugs on account controller

Showing 3 changed files with 12 additions and 1 deletions   Show diff stats
UPGRADE
  Diff comments   View file @5d91f91
... ... @@ -20,6 +20,14 @@ on lib/acts_as_having_settings
20 20  
21 21 I used the solution 1.
22 22  
  23 +I choose solution number 2 for Environment model. I think it is more clear in this situation.
  24 +I put the code:
  25 +
  26 + self.partial_updates = false
  27 +
  28 +on Environment model.
  29 +
  30 +
23 31 4 - acts_as_searchable -> find_by_contents
24 32  
25 33 I solved an incompatibility between paginate and geokit with an work around like this the one explained on the link:
... ...
app/controllers/public/account_controller.rb
  Diff comments   View file @5d91f91
... ... @@ -49,7 +49,8 @@ class AccountController < ApplicationController
49 49 @user.terms_of_use = environment.terms_of_use
50 50 @user.environment = environment
51 51 @terms_of_use = environment.terms_of_use
52   - @person = @user.build_person(params[:profile_data])
  52 + @person = Person.new(params[:profile_data])
  53 + @person.name = @user.login
53 54 @person.environment = @user.environment
54 55 if request.post? && params[self.icaptcha_field].blank?
55 56 @user.signup!
... ...
app/models/environment.rb
  Diff comments   View file @5d91f91
... ... @@ -3,6 +3,8 @@
3 3 # domains.
4 4 class Environment < ActiveRecord::Base
5 5  
  6 + self.partial_updates = false
  7 +
6 8 has_many :tasks, :dependent => :destroy, :as => 'target'
7 9  
8 10 PERMISSIONS['Environment'] = {
... ...