Mercurial > hg > soundsoftware-site

comparison app/controllers/users_controller.rb @ 107:361f1e8b2e23 luisf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Feature #1: Fixed the collection_select variable issue User edit view: removed wiki toolbar and description from the description text area in the user; User edit view: added institutions collection select; User show view: institution name now visible. Users_controller: fixed a bug retrieving the institution name
author luisf
date Fri, 17 Dec 2010 11:18:51 +0000
parents 0511601cda6b
children d70a0b926135
comparison
equal deleted inserted replaced
106:f6ea6ffaaeeb 107:361f1e8b2e23
53 @user = User.find(params[:id]) 53 @user = User.find(params[:id])
54 54
55 if @user.ssamr_user_detail != nil 55 if @user.ssamr_user_detail != nil
56 @description = @user.ssamr_user_detail.description 56 @description = @user.ssamr_user_detail.description
57 if @user.ssamr_user_detail.institution_id != nil 57 if @user.ssamr_user_detail.institution_id != nil
58 @institution = @institution.find(@user.ssamr_user_detail.institution_id) 58 @institution_name = Institution.find(@user.ssamr_user_detail.institution_id).name
59 end 59 end
60 end 60 end
61 61
62 # show projects based on current user visibility 62 # show projects based on current user visibility
63 @memberships = @user.memberships.all(:conditions => Project.visible_by(User.current)) 63 @memberships = @user.memberships.all(:conditions => Project.visible_by(User.current))