From b4eea9608aca914107e9e2e268403e979bf910d3 Mon Sep 17 00:00:00 2001 From: kid1194 Date: Tue, 24 Oct 2023 00:39:12 +0300 Subject: [PATCH] Update to 1.0.9 --- active_users/hooks.py | 9 +++------ active_users/utils/update.py | 30 +++++++++++++++++++++--------- active_users/version.py | 12 ++++++++++++ 3 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 active_users/version.py diff --git a/active_users/hooks.py b/active_users/hooks.py index d4ecf1b..42b0077 100644 --- a/active_users/hooks.py +++ b/active_users/hooks.py @@ -4,7 +4,7 @@ # Licence: Please refer to LICENSE file -from frappe import __version__ as frappe_version +from .version import __frappe_version_min_14__ app_name = "active_users" @@ -17,17 +17,14 @@ app_license = "MIT" -is_frappe_above_v13 = int(frappe_version.split(".")[0]) > 13 - - app_include_css = [ "active_users.bundle.css" -] if is_frappe_above_v13 else [ +] if __frappe_version_min_14__ else [ "/assets/active_users/css/active_users.css" ] app_include_js = [ "active_users.bundle.js" -] if is_frappe_above_v13 else [ +] if __frappe_version_min_14__ else [ "/assets/active_users/js/active_users.js" ] diff --git a/active_users/utils/update.py b/active_users/utils/update.py index 6e0ed9d..f393d2b 100644 --- a/active_users/utils/update.py +++ b/active_users/utils/update.py @@ -21,6 +21,7 @@ ) from active_users import __version__ +from active_users.version import __frappe_version_min_15__ from .common import ( _SETTINGS_, log_error, @@ -107,15 +108,26 @@ def compare_versions(verA, verB): ## Self def enqueue_send_notification(version, sender, receivers, message): - frappe.enqueue( - "active_users.utils.update.send_notification", - job_name=f"active_users-send-notification-{version}", - is_async=True, - version=version, - sender=sender, - receivers=receivers, - message=message - ) + if __frappe_version_min_15__: + frappe.enqueue( + "active_users.utils.update.send_notification", + job_id=f"active_users-send-notification-{version}", + is_async=True, + version=version, + sender=sender, + receivers=receivers, + message=message + ) + else: + frappe.enqueue( + "active_users.utils.update.send_notification", + job_name=f"active_users-send-notification-{version}", + is_async=True, + version=version, + sender=sender, + receivers=receivers, + message=message + ) ## Self diff --git a/active_users/version.py b/active_users/version.py new file mode 100644 index 0000000..be61bfd --- /dev/null +++ b/active_users/version.py @@ -0,0 +1,12 @@ +# Active Users © 2023 +# Author: Ameen Ahmed +# Company: Level Up Marketing & Software Development Services +# Licence: Please refer to LICENSE file + + +from frappe import __version__ as frappe_version + + +__frappe_version__ = int(frappe_version.split(".")[0]) +__frappe_version_min_15__ = __frappe_version__ > 14 +__frappe_version_min_14__ = __frappe_version__ > 13 \ No newline at end of file