Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gyuricska Milán
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
eb91be58
authored
Dec 13, 2017
by
Fukász Rómeó Ervin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix storage detail trash size error
parent
c77c627d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
circle/dashboard/views/storage.py
+2
-1
No files found.
circle/dashboard/views/storage.py
View file @
eb91be58
...
@@ -275,6 +275,7 @@ class StorageDetail(SuperuserRequiredMixin, UpdateView):
...
@@ -275,6 +275,7 @@ class StorageDetail(SuperuserRequiredMixin, UpdateView):
if
d
[
'name'
]
not
in
destroyed_filenames
]
if
d
[
'name'
]
not
in
destroyed_filenames
]
trash
=
[
d
for
d
in
data
[
'disks'
]
if
d
not
in
disks
]
trash
=
[
d
for
d
in
data
[
'disks'
]
if
d
not
in
disks
]
dumps_size
=
sum
(
d
[
'size'
]
for
d
in
data
[
'dumps'
])
dumps_size
=
sum
(
d
[
'size'
]
for
d
in
data
[
'dumps'
])
trash_size
=
sum
(
d
[
'size'
]
for
d
in
trash
)
iso_raw
=
sum
(
d
[
'size'
]
for
d
in
disks
iso_raw
=
sum
(
d
[
'size'
]
for
d
in
disks
if
d
[
'format'
]
in
(
"iso"
,
"raw"
))
if
d
[
'format'
]
in
(
"iso"
,
"raw"
))
...
@@ -292,7 +293,7 @@ class StorageDetail(SuperuserRequiredMixin, UpdateView):
...
@@ -292,7 +293,7 @@ class StorageDetail(SuperuserRequiredMixin, UpdateView):
'used_space'
:
filesizeformat
(
used_space
),
'used_space'
:
filesizeformat
(
used_space
),
'total_space'
:
filesizeformat
(
total_space
),
'total_space'
:
filesizeformat
(
total_space
),
'dumps'
:
dumps_size
,
'dumps'
:
dumps_size
,
'trash'
:
trash
,
'trash'
:
trash
_size
,
'iso_raw'
:
iso_raw
,
'iso_raw'
:
iso_raw
,
'vm_size'
:
vm_size
,
'vm_size'
:
vm_size
,
'vm_actual_size'
:
vm_actual_size
,
'vm_actual_size'
:
vm_actual_size
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment