Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-06 21:35:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Listing WEBSITES should show their space usage.

Browse Source
This commit is contained in:
Usman Nasir
2019-08-17 02:26:44 +05:00
parent 6e1da4fd28
commit 438f1671cc
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
websiteFunctions/templates/websiteFunctions/listWebsites.html
View File

@@ -77,9 +77,9 @@
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-4 content-box-header"> <div class="col-md-4 content-box-header">
<i class="p fa fa-envelope btn-icon text-muted" data-toggle="tooltip" data-placement="right" <i class="p fa fa-hdd-o btn-icon text-muted" data-toggle="tooltip" data-placement="right"
title="Email">&emsp;</i> title="Email">&emsp;</i>
<span ng-bind="web.adminEmail" style="text-transform: none"></span> <span ng-bind="web.diskUsed" style="text-transform: none"></span>
</div> </div>
<div class="col-md-4 content-box-header"> <div class="col-md-4 content-box-header">

5
websiteFunctions/website.py
View File

@@ -2084,8 +2084,11 @@ IdentityFile /home/%s/.ssh/%s
state = "Suspended" state = "Suspended"
else: else:
state = "Active" state = "Active"
diskUsed = "%sMB" % str(virtualHostUtilities.getDiskUsage("/home/" + items.domain, items.package.diskSpace)[0])
dic = {'domain': items.domain, 'adminEmail': items.adminEmail, 'ipAddress': ipAddress, dic = {'domain': items.domain, 'adminEmail': items.adminEmail, 'ipAddress': ipAddress,
'admin': items.admin.userName, 'package': items.package.packageName, 'state': state} 'admin': items.admin.userName, 'package': items.package.packageName, 'state': state, 'diskUsed': diskUsed}
if checker == 0: if checker == 0:
json_data = json_data + json.dumps(dic) json_data = json_data + json.dumps(dic)