From 57a4ea7cb034522a708a338e2d701b5014bf2716 Mon Sep 17 00:00:00 2001
From: Loic d'Anterroches <titoo@users.sourceforge.net>
Date: Sun, 30 Nov 2008 10:52:06 +0100
Subject: [PATCH] Fixed ticket 76, add the attached files in the issue
 notification emails.

Beware that you need to update your configuration file to add the new
template filter.
---
 src/IDF/Views/Source.php                             | 5 +++++
 src/IDF/conf/idf.php-dist                            | 1 +
 src/IDF/templates/idf/issues/issue-created-email.txt | 8 ++++++--
 src/IDF/templates/idf/issues/issue-updated-email.txt | 7 ++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/IDF/Views/Source.php b/src/IDF/Views/Source.php
index 57c8fab..b3a6bb0 100644
--- a/src/IDF/Views/Source.php
+++ b/src/IDF/Views/Source.php
@@ -446,3 +446,8 @@ function IDF_Views_Source_PrettySize($size)
                                                Pluf_Utils::prettySize($size)));
 }
 
+function IDF_Views_Source_PrettySizeSimple($size)
+{
+    return Pluf_Utils::prettySize($size);
+}
+
diff --git a/src/IDF/conf/idf.php-dist b/src/IDF/conf/idf.php-dist
index 65ef933..1426eaf 100644
--- a/src/IDF/conf/idf.php-dist
+++ b/src/IDF/conf/idf.php-dist
@@ -187,6 +187,7 @@ $cfg['template_tags'] = array(
                               );
 $cfg['template_modifiers'] = array(
                                    'size' => 'IDF_Views_Source_PrettySize',
+                                   'ssize' => 'IDF_Views_Source_PrettySizeSimple',
                                    );
 
 # available languages
diff --git a/src/IDF/templates/idf/issues/issue-created-email.txt b/src/IDF/templates/idf/issues/issue-created-email.txt
index da8f3c2..d17b268 100644
--- a/src/IDF/templates/idf/issues/issue-created-email.txt
+++ b/src/IDF/templates/idf/issues/issue-created-email.txt
@@ -12,7 +12,11 @@ to you:{/blocktrans}
 {/foreach}{/if}
 {trans 'Description:'}
 
-{$comment.content|safe}
-
+{$comment.content|safe}{assign $attachments = $comment.get_attachment_list()}
+{if $attachments.count() > 0}
+{trans 'Attachments:'}{foreach $attachments as $a}
+- {$a.filename|safe} - {$a.filesize|ssize}
+  {$url_base}{url 'IDF_Views_Issue::getAttachment', array($project.shortname, $a.id, $a.filename)}{/foreach}
+{/if}
 --
 {trans 'Issue:'} {$url_base}{url 'IDF_Views_Issue::view', array($project.shortname, $issue.id)}
diff --git a/src/IDF/templates/idf/issues/issue-updated-email.txt b/src/IDF/templates/idf/issues/issue-updated-email.txt
index d996aae..a7658de 100644
--- a/src/IDF/templates/idf/issues/issue-updated-email.txt
+++ b/src/IDF/templates/idf/issues/issue-updated-email.txt
@@ -16,7 +16,12 @@
 
 {if strlen($c.content) > 0}{$c.content|safe}{else}{trans '(No comments were given for this change.)'}{/if}{if $c.changedIssue()}
 {foreach $c.changes as $w => $v}
- {if $w == 'su'}{trans 'Summary:'}{/if}{if $w == 'st'}{trans 'Status:'}{/if}{if $w == 'ow'}{trans 'Owner:'}{/if}{if $w == 'lb'}{trans 'Labels:'}{/if} {if $w == 'lb'}{assign $l = implode(', ', $v)}{$l}{else}{$v}{/if}{/foreach}{/if}
+ {if $w == 'su'}{trans 'Summary:'}{/if}{if $w == 'st'}{trans 'Status:'}{/if}{if $w == 'ow'}{trans 'Owner:'}{/if}{if $w == 'lb'}{trans 'Labels:'}{/if} {if $w == 'lb'}{assign $l = implode(', ', $v)}{$l}{else}{$v}{/if}{/foreach}{/if}{assign $attachments = $c.get_attachment_list()}{if $attachments.count() > 0}
+
+{trans 'Attachments:'}{foreach $attachments as $a}
+- {$a.filename|safe} - {$a.filesize|ssize}
+  {$url_base}{url 'IDF_Views_Issue::getAttachment', array($project.shortname, $a.id, $a.filename)}{/foreach}
+{/if}
 
 {/foreach}