comparison app/controllers/users_controller.rb @ 55:bbb139d5ca95 luisf

changes to add SSAMR info. This is a development Commit - DO NOT USE this version.

   end
   
   def show
     @user = User.find(params[:id])
     
+    print @user.ssamr_user_detail.description
+    
+  #  @description = @user.ssamr_user_detail.description
+        
     # show projects based on current user visibility
     @memberships = @user.memberships.all(:conditions => Project.visible_by(User.current))
     
     events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
     @events_by_day = events.group_by(&:event_date)

 
     @user = User.new(params[:user])
     @user.admin = params[:user][:admin] || false
     @user.login = params[:user][:login]
     @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
+
+    @user.ssamr_user_detail.description = params[:user.ssamr_user_detail][:description]
+    
+    @ssamr_description = params[:user.ssamr_user_detail][:description]
 
     # TODO: Similar to My#account
     @user.mail_notification = params[:notification_option] || 'only_my_events'
     @user.pref.attributes = params[:pref]
     @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')

 
   def edit
     @user = User.find(params[:id])
     @notification_options = @user.valid_notification_options
     @notification_option = @user.mail_notification
+    
+#    @ssamr_description = @user.ssamr_user_detail
 
     @auth_sources = AuthSource.find(:all)
     @membership ||= Member.new
   end
   
   verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
   def update
     @user = User.find(params[:id])
+        
     @notification_options = @user.valid_notification_options
     @notification_option = @user.mail_notification
 
     @user.admin = params[:user][:admin] if params[:user][:admin]
     @user.login = params[:user][:login] if params[:user][:login]