Mercurial > hg > soundsoftware-site

diff 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
line wrap: on
line diff
--- a/app/controllers/users_controller.rb	Fri Dec 17 10:28:24 2010 +0000
+++ b/app/controllers/users_controller.rb	Fri Dec 17 11:18:51 2010 +0000
@@ -55,7 +55,7 @@
     if @user.ssamr_user_detail != nil
       @description = @user.ssamr_user_detail.description
       if @user.ssamr_user_detail.institution_id != nil
-        @institution = @institution.find(@user.ssamr_user_detail.institution_id)
+        @institution_name = Institution.find(@user.ssamr_user_detail.institution_id).name
       end
     end