Merge branch 'master' of github.com:diaspora/diaspora
This commit is contained in:
commit
8894fa4daa
1 changed files with 1 additions and 1 deletions
|
|
@ -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)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue