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

beautify map invocations of users

Browse source
This commit is contained in:
wvengen 2013-10-29 18:46:55 +01:00
parent 1870276cd2
commit e968919cce
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/users_controller.rb
View file

@ -4,7 +4,7 @@ class UsersController < ApplicationController
def index def index
@users = User.natural_search(params[:q]) @users = User.natural_search(params[:q])
respond_to do |format| respond_to do |format|
format.json { render :json => @users.map { |u| u.token_attributes } } format.json { render :json => @users.map(&:token_attributes) }
end end
end end

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

@ -36,7 +36,7 @@
= t '.list.mail', email: mail_to(FoodsoftConfig[:mailing_list_subscribe]) = t '.list.mail', email: mail_to(FoodsoftConfig[:mailing_list_subscribe])
#recipients #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 :recipient_tokens, :input_html => { 'data-pre' => User.find_all_by_id(@message.recipients_ids).map(&:token_attributes).to_json }
= f.input :group_id, :as => :select, :collection => Group.undeleted.order('type DESC, name ASC').all.reject { |g| g.memberships.empty? } = f.input :group_id, :as => :select, :collection => Group.undeleted.order('type DESC, name ASC').all.reject { |g| g.memberships.empty? }
= f.input :private = f.input :private
= f.input :subject, input_html: {class: 'input-xxlarge'} = f.input :subject, input_html: {class: 'input-xxlarge'}

2
app/views/shared/_group_form_fields.html.haml
View file

@ -4,7 +4,7 @@
= yield = yield
= f.input :user_tokens, :as => :string, = f.input :user_tokens, :as => :string,
:input_html => { 'data-pre' => f.object.users.map { |u| u.token_attributes }.to_json } :input_html => { 'data-pre' => f.object.users.map(&:token_attributes).to_json }
- content_for :javascript do - content_for :javascript do
:javascript :javascript

2
app/views/tasks/_form.html.haml
View file

@ -19,7 +19,7 @@
= f.input :name = f.input :name
= f.input :description, as: :text, input_html: {rows: 10} = f.input :description, as: :text, input_html: {rows: 10}
= f.input :duration, :as => :select, :collection => 1..3 = f.input :duration, :as => :select, :collection => 1..3
= f.input :user_list, :as => :string, :input_html => { 'data-pre' => @task.users.map { |u| u.token_attributes }.to_json } = f.input :user_list, :as => :string, :input_html => { 'data-pre' => @task.users.map(&:token_attributes).to_json }
= f.input :required_users = f.input :required_users
= f.association :workgroup = f.association :workgroup
= f.input :due_date, as: :date_picker = f.input :due_date, as: :date_picker