From: Maciej Tronowski <mtro@man.poznan.pl>
Date: Wed, 2 Sep 2015 15:40:51 +0000 (+0200)
Subject: fix ignoring current and parent directory in listing
X-Git-Tag: v1.1~23
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=31781847241095d02be6f2d7616ab92e1047281d;p=qcg-portal.git

fix ignoring current and parent directory in listing
---

diff --git a/filex/views.py b/filex/views.py
index 3215fd8..108f7c3 100644
--- a/filex/views.py
+++ b/filex/views.py
@@ -1,4 +1,3 @@
-from itertools import islice
 import logging
 import mimetypes
 import os
@@ -62,12 +61,12 @@ class ListView(FTPView):
         listing = ftp.listing(make_url(params, 'path'))
 
         data = []
-        # ignore . and .. from beginning of the listing
-        for item in islice(listing, 2, None):
-            item['size'] = filesizeformat(item['size'])
-            item['date'] = date_format(item['date'], 'CUSTOM_DATETIME_FORMAT')
+        for item in listing:
+            if item['name'] not in ['.', '..']:
+                item['size'] = filesizeformat(item['size'])
+                item['date'] = date_format(item['date'], 'CUSTOM_DATETIME_FORMAT')
 
-            data.append(item)
+                data.append(item)
 
         return JsonResponse(data, safe=False)