Merge pull request #4387 from matiu/bug/note2

Bug/note2
This commit is contained in:
Gustavo Maximiliano Cortez 2016-06-14 17:47:19 -03:00 committed by GitHub
commit f061209dff
2 changed files with 8 additions and 2 deletions

View file

@ -125,7 +125,7 @@
</span>
</li>
<li class="p10 oh" ng-show="btx.note">
<li class="p10 oh" ng-show="btx.note && btx.note.body">
<span class="text-gray" translate>Comment</span>
<span class="right enable_text_select">{{btx.note.body}}</span><br>
<span class="right text-italic text-gray size-12">

View file

@ -201,7 +201,13 @@
<span ng-if="!btx.message && !btx.note.body && !index.addressbook[btx.addressTo]" translate> Sent</span>
</span>
</span>
<span ng-show="btx.action == 'moved'" translate>Moved</span>
<span ng-show="btx.action == 'moved'">
<span class="ellipsis">
<span ng-if="btx.note.body">{{btx.note.body}}</span>
<span ng-if="!btx.note.body" translate>Moved</span>
</span>
</span>
<span class="label tu warning radius" ng-show="btx.action == 'invalid'" translate>Invalid</span>
</div>
</div>