bugfix
This commit is contained in:
parent
552ed8dd48
commit
ba7315b0ba
@ -47,7 +47,10 @@ class FileMgr:
|
|||||||
recs = await sor.sqlExe(sql, {'orgid': orgid})
|
recs = await sor.sqlExe(sql, {'orgid': orgid})
|
||||||
if len(recs) == 0:
|
if len(recs) == 0:
|
||||||
return 0
|
return 0
|
||||||
return recs[0].quota_used / 1000000
|
r = recs[0]
|
||||||
|
if r.quota_used is None:
|
||||||
|
r.quota_used = 0
|
||||||
|
return r.quota_used / 1000000
|
||||||
|
|
||||||
async def add_file(self, request, params_kw):
|
async def add_file(self, request, params_kw):
|
||||||
fs = FileStorage()
|
fs = FileStorage()
|
||||||
@ -126,12 +129,11 @@ class FileMgr:
|
|||||||
raise e
|
raise e
|
||||||
delrecs = []
|
delrecs = []
|
||||||
async for f in self.sor_get_subfile(sor, id):
|
async for f in self.sor_get_subfile(sor, id):
|
||||||
recs = await self._del_file(sor, f.id, ownerid)
|
rec = await self._del_file(sor, f.id, ownerid)
|
||||||
delrecs += recs
|
delrecs.append(rec)
|
||||||
async for f in self.sor_get_subfolder(sor, id):
|
async for f in self.sor_get_subfolder(sor, id):
|
||||||
rec = await self._del_folder(sor, f.id, ownerid)
|
recs = await self._del_folder(sor, f.id, ownerid)
|
||||||
if rec:
|
delrecs += recs
|
||||||
delrecs.append(rec)
|
|
||||||
await sor.D('folder', {'id': id})
|
await sor.D('folder', {'id': id})
|
||||||
return delrecs
|
return delrecs
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user