Some fixes for tasks.

app/views/tasks/_assignments.haml

@@ -1,5 +0,0 @@
-- @task.assignments.each do |ass|
-  = ass.user.nick
-  %small= link_to icon(:delete, :title => "#{ass.user.nick} entfernen"), |
-    {:action => "drop_assignment", :id => ass}, |
-    :confirm => 'Bist du sicher?', :method => "post" |

app/views/tasks/_form.html.haml

@@ -1,36 +1,9 @@
-= form.error_messages
-= form.hidden_field :weekly
-%p
-  %b Name
-  %br/
-  = form.text_field :name
-%p
-  %b Beschreibung
-  %br/
-  = form.text_area :description, :cols => 50, :rows => 10
-%p
-  %b Dauer
-  %small Wie lange dauert die Aufgabe, 1-3 Stunden
-  %br/
-  = form.select :duration, options_for_select(1..3, @task.duration)
-%p
-  %b Verantwortliche
-  %small Aufgaben können mehrere Verantwortliche haben
-  /%br/
-  /= render :partial => "assignments"
-%p
-  %small Benutze Kommas um mehrere Benutzerinnen zu trennen
-  %br/
-  = text_field_with_auto_complete :task, :user_list, {}, {:tokens => ","}
-%p
-  %b Wieviel Benutzerinnen werden insgesamt benötigt?
-  %br/
-  = form.text_field :required_users, :size => 3
-%p
-  %b Arbeitsgruppe
-  %br/
-  = form.select :workgroup_id, Workgroup.all(:order => 'name').collect {|g| [ g.name, g.id ] }, { :include_blank => true }
-%p
-  %b Fälligkeit
-  %br/
-  = form.date_select :due_date, :start_year => 2007, :include_blank => true
+= simple_form_for @task do |f|
+  = f.input :name
+  = f.input :description
+  = f.input :duration, :as => :select, :collection => 1..3
+  = f.input :user_list, :as => :string
+  = f.input :required_users
+  = f.association :workgroup
+  = f.input :due_date, :include_blank => true
+  = f.submit

app/views/tasks/_list.haml

@@ -11,15 +11,7 @@
       %td= format_date(task.due_date) unless task.due_date.nil?
       %td= link_to "#{task.name} (#{task.duration}h)", task_path(task)
       %td
-        - unless task.users.empty?
-          - owner = Array.new
-          - task.assignments.each do |ass| 
-            - if ass.accepted? 
-              - nick = "<span class='accepted'>#{ass.user.nick.to_s}</span>"
-            - else
-              - nick = "<span class='unaccepted'>#{ass.user.nick.to_s} ?</span>"
-            - owner << nick
-          = owner.join(", ")
+        = task_assignments task
         = highlighted_required_users task
       %td
         - unless task.is_accepted?(@current_user)

app/views/tasks/edit.haml

@@ -1,11 +1,7 @@
 - title "Aufgabe bearbeiten"
 
 #form{:style => "float:left; width:39em"}
-  - form_for @task do |form|
-    = render :partial => 'form', :locals => {:form => form}
-    = submit_tag "Speichern"
-    |
-    = link_to "Abbrechen", :action => "show", :id => @task
+  = render('form')
 #workgroup_members{:style => "padding-left:41em"}
   %h3 Mitglieder der Gruppe
   #list

app/views/tasks/new.haml

@@ -1,10 +1,8 @@
 - title "Neue Aufgabe erstellen"
 
 #form{:style => "float:left; width:39em"}
-  - form_for @task do |form|
-    = render :partial => 'form', :locals => {:form => form}
-    = submit_tag "Aufgabe erstellen"
- 
+  = render('form')
+  
 #workgroup_members{:style => "padding-left:41em"}
   %h3 Mitglieder der Arbeitsgruppen
   %i Klicke auf den Gruppennamen um die Mitglieder zu sehen

app/views/tasks/show.haml

@@ -18,7 +18,7 @@
       %td= @task.duration
     %tr
       %td Verantwortliche Menschen
-      %td= render :partial => "assignments"
+      %td= task_assignments(@task)
     %tr
       %td Arbeitsgruppe
       %td