fixed user profile updation

fatfreecrm · May 28, 2014 · 6d54cf2 · 6d54cf2
1 parent fce8961
commit 6d54cf2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -31,6 +31,7 @@ def edit
   #----------------------------------------------------------------------------
   def update
     @user.update_attributes(params[:user])
+    flash[:notice] = t(:profile_update)
     respond_with(@user)
   end
 

diff --git a/app/models/users/user.rb b/app/models/users/user.rb
@@ -41,8 +41,9 @@ class User < ActiveRecord::Base
   devise :database_authenticatable, :registerable, :confirmable,
     :encryptable, :recoverable, :rememberable, :trackable, stretches: 20
 
-  attr_accessible :username, :email, :password, :password_confirmation, :remember_me,
-    :first_name, :last_name, :title, :company, :group_ids
+  attr_accessible :username, :email, :password, :password_confirmation,
+    :remember_me, :first_name, :last_name, :title, :company, :group_ids,
+    :alt_email, :phone, :mobile, :aim, :yahoo, :google, :skype
 
   before_create  :check_if_needs_approval
   before_destroy :check_if_has_related_assets

diff --git a/app/views/users/update.js.haml b/app/views/users/update.js.haml
@@ -1,6 +1,8 @@
 - if @user.errors.empty?
   crm.flip_form('edit_profile');
   crm.set_title('edit_profile', '#{j t(:my_profile)}');
+  $('#flash').html('#{ j flash[:notice] }');
+  crm.flash('notice')
   $('#welcome_username').html('#{j current_user.name}');
   $('#profile').html('#{ j render(:partial => "user") }');
 - else