sixam/mail
1
0
Fork 0
mirror of https://github.com/mt-mods/mail.git synced 2025-07-07 07:00:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix unupdatable sorting fields values (settings)

Browse source
This commit is contained in:
Athozus 2023-05-04 18:24:07 +02:00
parent 1243f7fe93
commit e7fffbea2e
No known key found for this signature in database
GPG key ID: B50895022E8484BF
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
storage.lua
View file

@ -263,9 +263,9 @@ end
function mail.get_setting(playername, setting_name) function mail.get_setting(playername, setting_name)
local entry = mail.get_storage_entry(playername) local entry = mail.get_storage_entry(playername)
local setting = nil local setting = nil
for i, existing_setting in ipairs(entry.settings) do for _, existing_setting in ipairs(entry.settings) do
if existing_setting.name == setting_name then if existing_setting.name == setting_name then
setting = entry.settings[i].value setting = existing_setting.value
break break
end end
end end

18
ui/settings.lua
View file

@ -28,10 +28,10 @@ function mail.show_settings(name)
label[5,2.6;]] .. S("Default sorting fields") .. [[] label[5,2.6;]] .. S("Default sorting fields") .. [[]
dropdown[5.5,3.0;2,0.5;defaultsortfield;]] .. dropdown[5.5,3.0;2,0.5;defaultsortfield;]] ..
S("From/To") .. "," .. S("Subject") .. "," .. S("Date") .. [[;]] .. S("From/To") .. "," .. S("Subject") .. "," .. S("Date") .. [[;]] ..
mail.get_setting(name, "defaultsortfield") .. [[;true] tostring(mail.get_setting(name, "defaultsortfield")) .. [[;true]
dropdown[7.5,3.0;2,0.5;defaultsortdirection;]] .. dropdown[7.5,3.0;2,0.5;defaultsortdirection;]] ..
S("Ascending") .. "," .. S("Descending") .. [[;]] .. S("Ascending") .. "," .. S("Descending") .. [[;]] ..
mail.get_setting(name, "defaultsortdirection") .. [[;true] tostring(mail.get_setting(name, "defaultsortdirection")) .. [[;true]
button[0,5.5;2.5,0.5;reset;]] .. S("Reset") .. [[] button[0,5.5;2.5,0.5;reset;]] .. S("Reset") .. [[]
]] .. mail.theme ]] .. mail.theme
@ -46,10 +46,18 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
local playername = player:get_player_name() local playername = player:get_player_name()
mail.set_setting(playername, { name = "defaultsortfield", value = tonumber(fields.defaultsortfield) } )
mail.set_setting(playername, { name = "defaultsortdirection", value = tonumber(fields.defaultsortdirection) } )
if fields.back then if fields.back then
local defaultsortfield = fields.defaultsortfield or mail.get_setting("defaultsortfield")
local defaultsortdirection = fields.defaultsortdirection or mail.get_setting("defaultsortdirection")
mail.set_setting(playername, {
name = "defaultsortfield",
value = tonumber(defaultsortfield),
})
mail.set_setting(playername, {
name = "defaultsortdirection",
value = tonumber(defaultsortdirection),
})
mail.show_mail_menu(playername) mail.show_mail_menu(playername)
return return