IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-28 09:51:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

A fix in the model and a simple view for attachments.

Browse Source
This commit is contained in:
James Cole 2015-07-18 21:12:34 +02:00
parent 6a9574bab9
commit 359fab315f
4 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/TransactionJournal.php
View File

@ -472,7 +472,7 @@ class TransactionJournal extends Model
*/
public function attachments()
{
return $this->morphMany('App\Models\Attachment', 'attachable');
return $this->morphMany('FireflyIII\Models\Attachment', 'attachable');
}
/**

24
app/Support/Twig/General.php
View File

@ -35,7 +35,8 @@ class General extends Twig_Extension
$this->formatAmountPlain(),
$this->formatJournal(),
$this->balance(),
$this->getAccountRole()
$this->getAccountRole(),
$this->formatFilesize()
];
}
@ -66,6 +67,27 @@ class General extends Twig_Extension
return 'FireflyIII\Support\Twig\General';
}
protected function formatFilesize()
{
return new Twig_SimpleFilter(
'filesize', function ($size) {
$size = intval($size);
// less than one GB, more than one MB
if ($size < (1024 * 1024 * 2014) && $size >= (1024 * 1024)) {
return round($size / (1024 * 1024), 2) . ' MB';
}
// less than one MB
if ($size < (1024 * 1024)) {
return round($size / 1024, 2) . ' KB';
}
return $size . ' bytes';
}
);
}
/**
* @return Twig_SimpleFilter
*/

4
resources/twig/list/journals.twig
View File

@ -52,6 +52,10 @@
</td>
<td>
<a href="{{ route('transactions.show',journal.id) }}" title="{{ journal.description }}">{{ journal.description }}</a>
{% if journal.attachments|length > 0 %}
<i class="fa fa-paperclip pull-right"></i>
{% endif %}
</td>
<td>
{% if not hideTags %}

24
resources/twig/transactions/show.twig
View File

@ -74,6 +74,30 @@
</div>
</div>
</div>
<!-- attachments -->
<div class="box">
<div class="box-header with-border">
<h3 class="box-title">{{ 'attachments'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding">
<table class="table table-hover">
{% for att in journal.attachments %}
<tr>
<td>
<a href="#" class="btn btn-xs btn-danger"><i class="fa fa-trash"></i></a>
</td>
<td>
<i class="fa fa-file-pdf-o"></i>
<a href="#">{{ att.filename }}</a>
({{ att.size|filesize }})
</td>
</tr>
{% endfor %}
</table>
</div>
</div>
<!-- events, if present -->
{% if journal.piggyBankEvents|length > 0 %}
<div class="box">