Projet

Général

Profil

0001-publish-occupancy-16828.patch

Benjamin Dauvergne, 03 avril 2018 10:59

Télécharger (2,09 ko)

Voir les différences:

Subject: [PATCH] publish occupancy (#16828)

As an absolute size, as a ratio of the max size and as a percentage of
the max size.
 fargo/fargo/models.py | 4 ++++
 fargo/fargo/views.py  | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)
fargo/fargo/models.py
212 212
                           thumbnail.height,
213 213
                           data_url)
214 214

  
215
    @classmethod
216
    def occupancy_for_user(cls, user):
217
        return float(sum(document.content.size for document in cls.objects.filter(user_documents__user=user).distinct()))
218

  
215 219
    def __unicode__(self):
216 220
        return u'%s %s' % (os.path.basename(self.content.name), self.content_hash[:6])
217 221

  
fargo/fargo/views.py
86 86
        ctx = super(Homepage, self).get_context_data(**kwargs)
87 87
        ctx['include_edit_link'] = settings.INCLUDE_EDIT_LINK
88 88
        ctx['max_document_size'] = settings.FARGO_MAX_DOCUMENT_SIZE
89
        occupancy = ctx['occupancy'] = models.Document.occupancy_for_user(self.request.user)
90
        max_size = ctx['max_portfolio_size'] = settings.FARGO_MAX_DOCUMENT_BOX_SIZE
91
        ctx['occupancy_ratio'] = float(occupancy) / max_size
92
        ctx['occupancy_ratio_percent'] = float(occupancy) * 100.0 / max_size
89 93
        return ctx
90 94

  
91 95
    def get_success_url(self):
......
182 186
        thumbnail = user_document.document.thumbnail
183 187
        if not thumbnail:
184 188
            raise Http404
185
        return HttpResponse(thumbnail.chunks(), content_type='image/jpeg')
189
        return HttpResponse(thumbnail.read(), content_type='image/jpeg')
186 190

  
187 191

  
188 192
class RemoteDownload(Download):
189
-