Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3

Browse source 
Conflicts:
	Gemfile
This commit is contained in:
benni 2012-11-24 15:27:48 +01:00
commit 7c9d666909
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/messages/new.haml
View file

@ -37,10 +37,10 @@
#recipients
= f.input :recipient_tokens, :input_html => { 'data-pre' => User.find_all_by_id(@message.recipients_ids).map { |u| u.token_attributes }.to_json }
= f.input :group_id, :as => :select, :collection => Group.order('type DESC, name DESC').all.reject { |g| g.memberships.empty? }
= f.input :group_id, :as => :select, :collection => Group.order('type DESC, name ASC').all.reject { |g| g.memberships.empty? }
= f.input :private
= f.input :subject, input_html: {class: 'input-xxlarge'}
= f.input :body, input_html: {class: 'input-xxlarge'}
.form-actions
= f.submit
= link_to 'oder abbrechen', :back
= link_to 'oder abbrechen', :back