diff --git a/frappe-ui b/frappe-ui index 204333c9..5e976a17 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit 204333c9256f21fca5f5c50acd66cee11aeca4f3 +Subproject commit 5e976a1753524030f93bc2a5880764ecdd135328 diff --git a/frontend/package.json b/frontend/package.json index 1bf08668..0cb5efc1 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -33,7 +33,7 @@ "dayjs": "^1.11.6", "dompurify": "^3.2.6", "feather-icons": "^4.28.0", - "frappe-ui": "^0.1.216", + "frappe-ui": "^0.1.220", "highlight.js": "^11.11.1", "lucide-vue-next": "^0.383.0", "markdown-it": "^14.0.0", diff --git a/frontend/src/index.css b/frontend/src/index.css index 92b6d76d..32ecf2d7 100644 --- a/frontend/src/index.css +++ b/frontend/src/index.css @@ -1,3 +1,3 @@ @import './assets/Inter/inter.css'; -@import 'frappe-ui/src/style.css'; +@import 'frappe-ui/style.css'; @import './styles/codemirror.css'; \ No newline at end of file diff --git a/frontend/src/socket.js b/frontend/src/socket.js index ad69de52..70f0a91c 100644 --- a/frontend/src/socket.js +++ b/frontend/src/socket.js @@ -1,7 +1,5 @@ import { io } from 'socket.io-client' import { socketio_port } from '../../../../sites/common_site_config.json' -import { getCachedListResource } from 'frappe-ui/src/resources/listResource' -import { getCachedResource } from 'frappe-ui/src/resources/resources' export function initSocket() { let host = window.location.hostname @@ -14,15 +12,5 @@ export function initSocket() { withCredentials: true, reconnectionAttempts: 5, }) - socket.on('refetch_resource', (data) => { - if (data.cache_key) { - let resource = - getCachedResource(data.cache_key) || - getCachedListResource(data.cache_key) - if (resource) { - resource.reload() - } - } - }) return socket } diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js index 522480bb..e0f7f20a 100644 --- a/frontend/tailwind.config.js +++ b/frontend/tailwind.config.js @@ -1,4 +1,4 @@ -import frappeUIPreset from 'frappe-ui/src/tailwind/preset' +import frappeUIPreset from 'frappe-ui/tailwind' export default { presets: [frappeUIPreset], diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 8904dafc..b86be152 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2938,10 +2938,10 @@ fraction.js@^5.3.4: resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-5.3.4.tgz#8c0fcc6a9908262df4ed197427bdeef563e0699a" integrity sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ== -frappe-ui@^0.1.216: - version "0.1.216" - resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.216.tgz#2297192cfcf13db7f9d4e374782fac1d42d54634" - integrity sha512-rBBa5CZdRaYGllxU95uz1luVddZlZQXWxoPB7InxKqt5W/t7ZDqAudm6Crbo1kBy3Hp7VPNNbB43jVKJhlcrPQ== +frappe-ui@^0.1.220: + version "0.1.220" + resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.220.tgz#689731816f8e97e8574bad797caf1f09de94cbad" + integrity sha512-UOlndnoXxxpQM+FjlH7ybSXQgERxdDS0hZNyEna/GPUrm8xMTqKsgnWRqgyv1VLdv/qCDmQT/KNgo5TstHKLhg== dependencies: "@floating-ui/vue" "^1.1.6" "@headlessui/vue" "^1.7.14" diff --git a/lms/lms/api.py b/lms/lms/api.py index 8f3ef261..f7c69de4 100644 --- a/lms/lms/api.py +++ b/lms/lms/api.py @@ -1678,7 +1678,18 @@ def get_profile_details(username): details = frappe.db.get_value( "User", {"username": username}, - ["full_name", "name", "username", "user_image", "bio", "headline", "cover_image"], + [ + "first_name", + "last_name", + "full_name", + "name", + "username", + "user_image", + "bio", + "headline", + "language", + "cover_image", + ], as_dict=True, ) diff --git a/lms/lms/doctype/lms_certificate/lms_certificate.py b/lms/lms/doctype/lms_certificate/lms_certificate.py index 620c0abc..eb3aa1ee 100644 --- a/lms/lms/doctype/lms_certificate/lms_certificate.py +++ b/lms/lms/doctype/lms_certificate/lms_certificate.py @@ -19,7 +19,7 @@ class LMSCertificate(Document): self.name = make_autoname("hash", self.doctype) def after_insert(self): - if not frappe.flags.in_test: + if not frappe.in_test: outgoing_email_account = frappe.get_cached_value( "Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name" )