Skip to content

Commit

Permalink
Update to 1.0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
kid1194 committed Oct 23, 2023
1 parent 4907a80 commit b4eea96
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 15 deletions.
9 changes: 3 additions & 6 deletions active_users/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
]

Expand Down
30 changes: 21 additions & 9 deletions active_users/utils/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
)

from active_users import __version__
from active_users.version import __frappe_version_min_15__
from .common import (
_SETTINGS_,
log_error,
Expand Down Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions active_users/version.py
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit b4eea96

Please sign in to comment.