Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing.

app/views/shared/_group.html.haml

@@ -2,16 +2,16 @@
   %tr
     %td Beschreibung:
     %td=h group.description
+  - if @current_user.role_admin? or @current_user.role_finance?
+    %tr
+      %td Kontakt:
+      %td=h group.contact
+    %tr
+      %td Adresse:
+      %td= link_to_gmaps group.contact_address
   %tr
     %td Gruppe hat Zugriff auf:
-    %td
-      - roles = Array.new
-      - roles << 'Administration' if group.role_admin?
-      - roles << 'Finanzen' if group.role_finance?
-      - roles << 'Lieferanten' if group.role_suppliers?
-      - roles << 'Artikel' if group.role_article_meta?
-      - roles << 'Bestellungsverwaltung' if group.role_orders?
-      = roles.join(', ')
+    %td= format_roles(group)
   %tr
     %td Mitglieder:
     %td

app/views/shared/_user_form.rhtml

@@ -21,10 +21,6 @@
    <td><%= @form.label :phone %></td>
    <td><%= @form.text_field :phone  %></td>
  </tr>
- <tr>
-   <td><%= @form.label :address %></td>
-   <td><%= @form.text_field :address  %></td>
- </tr>
  <tr>
    <td/>
  </tr>