Refactored messages modul, but refactoring is still neccessary.

This commit is contained in:
benni 2011-05-18 14:47:17 +02:00
parent 6ac04d5e19
commit d5552059ce
13 changed files with 81 additions and 146 deletions

View file

@ -17,7 +17,7 @@
%tbody
- for ordergroup in @ordergroups
%tr{:class => cycle('even','odd', :name => 'ordergroup')}
%td= link_to h(ordergroup.name), group_message_path(ordergroup), :title => "Bestellgruppe eine Nachricht schicken"
%td= link_to h(ordergroup.name), new_message_path(:message => {:group_id => ordergroup.id}), :title => "Bestellgruppe eine Nachricht schicken"
%td=h ordergroup.users.collect { |u| u.nick }.join(", ")
%td
- order = ordergroup.orders.first(:order => 'starts DESC')

View file

@ -20,7 +20,7 @@
- users = params[:sort_by_ordergroups] ? @users.sort { |a,b| a.ordergroup.name <=> b.ordergroup.name } : @users
- for user in users
%tr{:class => cycle('even','odd', :name => 'users')}
%td= link_to user.nick, user_message_path(user), :title => _('Send user an email')
%td= link_to user.nick, new_message_path(:message => {:mail_to => user.id}), :title => _('Send user an email')
%td=h user.name if @current_user.role_admin? || user.settings["profile.nameIsPublic"] == '1'
%td=h user.email if @current_user.role_admin? || user.settings["profile.emailIsPublic"] == '1'
%td=h user.phone if @current_user.role_admin? || user.settings["profile.phoneIsPublic"] == '1'

View file

@ -6,7 +6,7 @@
%p
= link_to "Alle Aufgaben zeigen", :controller => "/tasks", :action => "workgroup", :id => workgroup
|
= link_to "Mitgliedern eine Nachricht schicken", :controller => '/messages', :action => 'group', :id => workgroup
= link_to "Mitgliedern eine Nachricht schicken", new_message_path(:message => {:group_id => workgroup.id})
- if workgroup.member?(@current_user)
|
= link_to "Gruppe bearbeiten", edit_foodcoop_workgroup_path(workgroup)