Merge branch 'master' of github.com:diaspora/diaspora

This commit is contained in:
ilya 2010-10-18 16:28:57 -07:00
commit 8894fa4daa

View file

@ -4,7 +4,7 @@
= invite.label :email = invite.label :email
= invite.text_field :email = invite.text_field :email
To To
- if @aspect == :all - unless @aspect.is_a? Aspect
= invite.select(:aspects, @aspects_dropdown_array) = invite.select(:aspects, @aspects_dropdown_array)
- else - else
= invite.select(:aspects, @aspects_dropdown_array, :selected => @aspect.id) = invite.select(:aspects, @aspects_dropdown_array, :selected => @aspect.id)