diff --git a/databases/databaseManager.py b/databases/databaseManager.py index 55c11bfb7..b5fbf48cf 100755 --- a/databases/databaseManager.py +++ b/databases/databaseManager.py @@ -158,9 +158,9 @@ class DatabaseManager: def listDBs(self, request = None, userID = None): currentACL = ACLManager.loadedACL(userID) - websitesName = ACLManager.findAllSites(currentACL, userID) + AllWebsites = ACLManager.findAllSites(currentACL, userID) template = 'databases/listDataBases.html' - proc = httpProc(request, template, {'websitesList': websitesName}, 'listDatabases') + proc = httpProc(request, template, {'AllWebsites': AllWebsites}, 'listDatabases') return proc.render() def changePassword(self, userID = None, data = None): diff --git a/databases/templates/databases/listDataBases.html b/databases/templates/databases/listDataBases.html index 2f8589839..9423ec949 100755 --- a/databases/templates/databases/listDataBases.html +++ b/databases/templates/databases/listDataBases.html @@ -26,7 +26,7 @@
diff --git a/ftp/ftpManager.py b/ftp/ftpManager.py index 8c1e0e3a4..2eda896ed 100755 --- a/ftp/ftpManager.py +++ b/ftp/ftpManager.py @@ -53,7 +53,7 @@ class FTPManager: websitesName = ACLManager.findAllSites(currentACL, userID) proc = httpProc(self.request, 'ftp/createFTPAccount.html', - {'websiteList': websitesName, 'admin': admin.userName, "status": 1}, 'createFTPAccount') + {'websiteList': websitesName, 'OwnerFTP': admin.userName, "status": 1}, 'createFTPAccount') return proc.render() def submitFTPCreation(self): diff --git a/ftp/templates/ftp/createFTPAccount.html b/ftp/templates/ftp/createFTPAccount.html index eb32ccad3..9c068cf8c 100755 --- a/ftp/templates/ftp/createFTPAccount.html +++ b/ftp/templates/ftp/createFTPAccount.html @@ -59,7 +59,7 @@
-
{{ admin }}_{$ ftpUserName $}
+
{{ OwnerFTP }}_{$ ftpUserName $}