diff options
| -rw-r--r-- | Gemfile.lock | 12 | ||||
| -rw-r--r-- | app/views/admins/user_search.html.haml | 10 |
2 files changed, 12 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2165370e3..074063b53 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,7 +128,7 @@ GEM ohai (>= 0.5.7) rest-client (>= 1.0.4, < 1.7.0) uuidtools - childprocess (0.1.6) + childprocess (0.1.7) ffi (~> 0.6.3) closure-compiler (1.0.0) cloudfiles (1.4.10) @@ -336,17 +336,17 @@ GEM rubyntlm (0.1.1) rubyzip (0.9.4) selenium-client (1.2.18) - selenium-rc (2.2.4) + selenium-rc (2.3.1) selenium-client (>= 1.2.18) - selenium-webdriver (0.1.2) + selenium-webdriver (0.1.3) childprocess (~> 0.1.5) ffi (~> 0.6.3) json_pure rubyzip simple_oauth (0.1.4) - sinatra (1.1.2) + sinatra (1.1.3) rack (~> 1.1) - tilt (~> 1.2) + tilt (>= 1.2.2, < 2.0) subexec (0.0.4) systemu (1.2.0) term-ansicolor (1.0.5) @@ -369,7 +369,7 @@ GEM crack (>= 0.1.7) will_paginate (3.0.pre2) xml-simple (1.0.14) - yui-compressor (0.9.3) + yui-compressor (0.9.4) PLATFORMS ruby diff --git a/app/views/admins/user_search.html.haml b/app/views/admins/user_search.html.haml index e6672c8a8..f57ba0f3c 100644 --- a/app/views/admins/user_search.html.haml +++ b/app/views/admins/user_search.html.haml @@ -30,10 +30,12 @@ = for user in @users = user.inspect %br - = user.person.inspect - %br - = user.person.profile.inspect - %br + - if user.person + = user.person.inspect + %br + - if user.person.profile + = user.person.profile.inspect + %br = "invite token: #{accept_invitation_url(user, :invitation_token => user.invitation_token)}" if user.invitation_token %br %br |