From 4c3db218c19b7a6dac1bfba3a971d97299a75ae3 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Tue, 22 Feb 2022 15:55:45 +0500 Subject: [PATCH] important links --- .../templates/baseTemplate/index.html | 146 ++++++++++-------- plogical/backupUtilities.py | 6 +- 2 files changed, 86 insertions(+), 66 deletions(-) diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html index 2baee03bd..34026a670 100755 --- a/baseTemplate/templates/baseTemplate/index.html +++ b/baseTemplate/templates/baseTemplate/index.html @@ -62,7 +62,8 @@ - + {% block title %}Page Title{% endblock %} @@ -82,12 +83,15 @@ - - + + - + {% block styles %} {% endblock %} @@ -198,7 +202,7 @@
- {$ one $} @@ -211,71 +215,78 @@ {$ three $} + {% endcomment %} + +{# #} + + + + + - - +
@@ -315,6 +326,13 @@ data-original-title=".icon-cloud-upload" aria-describedby="tooltip896208"> {% trans "Connect" %} + + + {% trans "Community" %} + + {% endif %}
  • diff --git a/plogical/backupUtilities.py b/plogical/backupUtilities.py index bcc4db7a5..287657797 100755 --- a/plogical/backupUtilities.py +++ b/plogical/backupUtilities.py @@ -395,8 +395,10 @@ class backupUtilities: status = os.path.join(backupPath, 'status') logging.CyberCPLogFileWriter.statusWriter(status, "Aborted, " + str(msg) + ".[365] [5009]") print(f"Aborted, {str(msg)}.[365] [5009]") - - os.remove(pidFile) + try: + os.remove(pidFile) + except: + pass @staticmethod def BackupRoot(tempStoragePath, backupName, backupPath, metaPath=None, externalApp = None):