diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 29fbd97c..0ef11b81 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,4 +1,5 @@
class HomeController < ApplicationController
+ helper :messages
def index
@currentOrders = Order.find_current
@@ -10,7 +11,7 @@ class HomeController < ApplicationController
@unaccepted_tasks = @current_user.unaccepted_tasks
# task in next week
@next_tasks = @current_user.next_tasks
-
+ @messages = Message.user.find :all, :limit => 5
# count tasks with no responsible person
# tasks for groups the current user is not a member are ignored
tasks = Task.find(:all, :conditions => ["assigned = ? and done = ?", false, false])
diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb
index 75d7afae..03bcc645 100644
--- a/app/helpers/messages_helper.rb
+++ b/app/helpers/messages_helper.rb
@@ -11,7 +11,7 @@ module MessagesHelper
groups
end
- def format_subject(message)
- truncate "#{link_to(h(message.subject), message)} #{h(message.body)}", :length => 200
+ def format_subject(message, length)
+ truncate "#{link_to(h(message.subject), message)} #{h(message.body)}", :length => length
end
end
diff --git a/app/models/ordergroup.rb b/app/models/ordergroup.rb
index 98622c14..7ffe0f92 100644
--- a/app/models/ordergroup.rb
+++ b/app/models/ordergroup.rb
@@ -125,9 +125,8 @@ class Ordergroup < Group
{:group => self, :transaction => transaction},
{:recipients_ids => users.collect(&:id), :subject => "Gruppenkonto im Minus"}
).save!
- end
end
- end
+ end
end
# before create or update, check if the name is already used in GroupOrderResults
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 4f3c4af9..d81b8901 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -31,6 +31,12 @@
// Current orders
= render :partial => 'ordering/currentOrders'
+ - unless @messages.empty?
+ .box_title
+ %h2 Neuste Nachrichten
+ .column_content
+ = render :partial => 'messages/messages', :locals => { :subject_length => 110 }
+
// Ordergroup overview
.box_title
%h2=_ "My ordergroup"
diff --git a/app/views/messages/_messages.html.haml b/app/views/messages/_messages.html.haml
index 0ada3cf8..f5155a55 100644
--- a/app/views/messages/_messages.html.haml
+++ b/app/views/messages/_messages.html.haml
@@ -1,12 +1,11 @@
- unless @messages.empty?
- - form_tag :action => 'destroy' do
- %table.list
- %tbody
- - for message in @messages
- %tr{:class => cycle('even','odd', :name => 'messages')}
- %td
- %b= h(message.sender_name)
- %td= format_subject(message)
- %td= format_time(message.created_at)
- %td= link_to('Antworten', reply_message_path(message))
+ %table.list
+ %tbody
+ - for message in @messages
+ %tr{:class => cycle('even','odd', :name => 'messages')}
+ %td
+ %b= h(message.sender_name)
+ %td= format_subject(message, subject_length)
+ %td= format_time(message.created_at)
+ %td= link_to('Antworten', reply_message_path(message))
\ No newline at end of file
diff --git a/app/views/messages/index.html.haml b/app/views/messages/index.html.haml
index 7d4f4eb1..5a67f196 100644
--- a/app/views/messages/index.html.haml
+++ b/app/views/messages/index.html.haml
@@ -3,4 +3,4 @@
%p= link_to('Neue Nachricht', :action => 'new')
#messages
- = render :partial => 'messages'
\ No newline at end of file
+ = render :partial => 'messages', :locals => { :subject_length => 200 }
\ No newline at end of file