vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

feat(UX): Add autocomplete for User timezone (#22456)

Browse source 
* feat(UX): Add autocomplete for User timezone

* Revert "feat(UX): Add autocomplete for User timezone"

This reverts commit a721b4a1ef8e0e6b656b6795b832324a955b2f7a.

* fix: convert tz to autocomplete

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
This commit is contained in:
Corentin Flr 2023-09-18 19:07:32 +02:00 • committed by GitHub
parent e152ebc0a3
commit d73a854191
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/core/doctype/user/user.js
View file

@ -1,7 +1,7 @@
frappe.ui.form.on("User", {
before_load: function (frm) {
var update_tz_select = function (user_language) {
frm.set_df_property("time_zone", "options", [""].concat(frappe.all_timezones));
let update_tz_options = function () {
frm.fields_dict.time_zone.set_data(frappe.all_timezones);
};
if (!frappe.all_timezones) {
@ -9,11 +9,11 @@ frappe.ui.form.on("User", {
method: "frappe.core.doctype.user.user.get_timezones",
callback: function (r) {
frappe.all_timezones = r.message.timezones;
update_tz_select();
update_tz_options();
},
});
} else {
update_tz_select();
update_tz_options();
}
},

4
frappe/core/doctype/user/user.json
View file

@ -191,7 +191,7 @@
},
{
"fieldname": "time_zone",
"fieldtype": "Select",
"fieldtype": "Autocomplete",
"label": "Time Zone"
},
{
@ -762,7 +762,7 @@
"link_fieldname": "user"
}
],
"modified": "2023-06-05 17:26:04.127555",
"modified": "2023-09-18 22:19:49.933972",
"modified_by": "Administrator",
"module": "Core",
"name": "User",

2
frappe/core/doctype/user/user.py
View file

@ -104,7 +104,7 @@ class User(Document):
simultaneous_sessions: DF.Int
social_logins: DF.Table[UserSocialLogin]
thread_notify: DF.Check
time_zone: DF.Literal
time_zone: DF.Autocomplete | None
unsubscribed: DF.Check
user_emails: DF.Table[UserEmail]
user_image: DF.AttachImage | None