Some fixes for task module.

app/views/shared/_workgroup_members.haml

@@ -1,6 +1,6 @@
-- for group in Group.find :all, :conditions => "type != 'Ordergroup'"
-  %h4= link_to_function group.name, "Element.toggle('workgroup_#{group.id}')"
-  %ul{:style => "display:none"}[group]
-    - for user in group.users.find :all, :order => "nick"
-      %li= user.nick + " (#{user.ordergroup.name if user.ordergroup})"
+- for workgroup in Workgroup.all
+  %h4= link_to workgroup.name, "#", 'data-toggle_this' => "#workgroup_#{workgroup.id}"
+  %ul{:style => "display:none"}[workgroup]
+    - for user in workgroup.users.order("nick")
+      %li= "#{user.nick} (#{user.ordergroup.try(:name)})"
   

app/views/tasks/_form.html.haml

@@ -11,7 +11,7 @@
   = f.input :name
   = f.input :description
   = f.input :duration, :as => :select, :collection => 1..3
-  = f.input :user_list, :as => :string, :input_html => { 'data-pre' => @task.users.map { |u| {:id => u.id, :name => u.nick} }.to_json }
+  = f.input :user_list, :as => :string, :input_html => { 'data-pre' => @task.users.map { |u| u.token_attributes }.to_json }
   = f.input :required_users
   = f.association :workgroup
   = f.input :due_date, :include_blank => true