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

Some fixes in group forms.

Browse source
This commit is contained in:
benni 2012-07-31 18:48:41 +02:00
parent f759552022
commit fc8418bc8e
5 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/admin/ordergroups_controller.rb
View file

@ -1,3 +1,4 @@
# encoding: utf-8
class Admin::OrdergroupsController < Admin::BaseController class Admin::OrdergroupsController < Admin::BaseController
inherit_resources inherit_resources

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

@ -3,7 +3,10 @@
$(function() { $(function() {
$('#message_recipient_tokens').tokenInput("#{users_path(:format => :json)}", { $('#message_recipient_tokens').tokenInput("#{users_path(:format => :json)}", {
crossDomain: false, crossDomain: false,
prePopulate: $('#message_recipient_tokens').data('pre') prePopulate: $('#message_recipient_tokens').data('pre'),
hintText: 'Nach Nutzerin suchen',
noResultText: 'Keine Nutzerin gefunden',
searchingText: 'Suche ...'
}); });
$('#message_sent_to_all').click(function() { $('#message_sent_to_all').click(function() {

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

@ -12,6 +12,7 @@
= f.input :task_required_users = f.input :task_required_users
= f.input :task_duration, :as => :select, :collection => (1..3) = f.input :task_duration, :as => :select, :collection => (1..3)
= f.input :task_description = f.input :task_description
= f.input :next_weekly_tasks_number
= f.input :user_tokens, :as => :string, :input_html => { 'data-pre' => f.object.users.map { |u| u.token_attributes }.to_json } = f.input :user_tokens, :as => :string, :input_html => { 'data-pre' => f.object.users.map { |u| u.token_attributes }.to_json }
@ -35,7 +36,10 @@
$("##{f.object.class.to_s.underscore}_user_tokens").tokenInput("#{users_path(:format => :json)}", { $("##{f.object.class.to_s.underscore}_user_tokens").tokenInput("#{users_path(:format => :json)}", {
crossDomain: false, crossDomain: false,
prePopulate: $("##{f.object.class.to_s.underscore}_user_tokens").data("pre") prePopulate: $("##{f.object.class.to_s.underscore}_user_tokens").data("pre"),
hintText: 'Nach Nutzerin suchen',
noResultText: 'Keine Nutzerin gefunden',
searchingText: 'Suche ...'
}); });
}); });

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

@ -3,7 +3,10 @@
$(function() { $(function() {
$("#task_user_list").tokenInput("#{users_path(:format => :json)}", { $("#task_user_list").tokenInput("#{users_path(:format => :json)}", {
crossDomain: false, crossDomain: false,
prePopulate: $("#task_user_list").data("pre") prePopulate: $("#task_user_list").data("pre"),
hintText: 'Nach Nutzerin suchen',
noResultText: 'Keine Nutzerin gefunden',
searchingText: 'Suche ...'
}); });
}); });

1
config/locales/de.yml
View file

@ -287,6 +287,7 @@ de:
task_required_users: 'Benötige Verantwortliche' task_required_users: 'Benötige Verantwortliche'
task_duration: 'Vor. Dauer in Stunden' task_duration: 'Vor. Dauer in Stunden'
task_description: 'Beschreibung' task_description: 'Beschreibung'
next_weekly_tasks_number: "Für wieviel Wochen im Voraus sollen Aufgaben erstellt werden?"
role_admin: "Administration" role_admin: "Administration"
role_finance: "Fianzen" role_finance: "Fianzen"
role_suppliers: "Lieferanten" role_suppliers: "Lieferanten"