aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-27 11:35:22 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/task-list-update' of https://github.com/bbassie/scenario into feature/task-list-update

Browse Source
This commit is contained in:
bbassie
2021-04-28 00:28:51 +02:00
parent a3fe06b1f8 ea8e093c31
commit dfcefb3a1b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/control/tasks.lua
View File

@@ -179,4 +179,4 @@ function Tasks.get_editing(task_id, player_name)
end end
-- Module Return -- Module Return
return Tasks return Tasks

10
modules/gui/task-list.lua
View File

@@ -317,15 +317,15 @@ local task_view_footer =
local message_pattern = "(.-)\n(.*)" local message_pattern = "(.-)\n(.*)"
--- Parce a string into a message object with title and body --- Parse a string into a message object with title and body
-- @tparam string str message data -- @tparam string str message data
local function parse_message(str) local function parse_message(str)
-- Trimm the spaces of the string -- Trim the spaces of the string
local trimmed = string.gsub(str, "^%s*(.-)%s*$", "%1") local trimmed = string.gsub(str, "^%s*(.-)%s*$", "%1")
local message = { title = "", body = "" } local message = { title = "", body = "" }
local title, body = string.match(trimmed, message_pattern) local title, body = string.match(trimmed, message_pattern)
if not title then if not title then
-- If it doesn't match the patter return the str as a title -- If it doesn't match the pattern return the str as a title
message.title = trimmed message.title = trimmed
else else
message.title = title message.title = title
@@ -501,7 +501,7 @@ local task_list_container =
task_view_footer_element.visible = false task_view_footer_element.visible = false
task_edit_footer_element.visible = false task_edit_footer_element.visible = false
task_create_footer_element.visible = false task_create_footer_element.visible = false
-- Return the exteral container -- Return the external container
return container.parent return container.parent
end end
):add_to_left_flow( ):add_to_left_flow(
@@ -718,7 +718,7 @@ local function role_update_event(event)
PlayerSelected:set(selected) PlayerSelected:set(selected)
end end
-- Update the new task button and create footer incase the user can now add them -- Update the new task button and create footer in case the user can now add them
local has_permission = check_player_permissions(player) local has_permission = check_player_permissions(player)
local add_new_task_element = container.header.alignment[add_new_task.name] local add_new_task_element = container.header.alignment[add_new_task.name]
add_new_task_element.visible = has_permission add_new_task_element.visible = has_permission