# HG changeset patch # User bsw # Date 1612791913 -3600 # Node ID 70121e414479c26c66dcedbc5637b32c29a8d3b5 # Parent d9ccd0d6ef8ced9c29a7487d9e5551fbf9539367 Removed fastpath related code diff -r d9ccd0d6ef8c -r 70121e414479 app/main/member_image/_show.lua --- a/app/main/member_image/_show.lua Mon Feb 08 14:28:28 2021 +0100 +++ b/app/main/member_image/_show.lua Mon Feb 08 14:45:13 2021 +0100 @@ -8,30 +8,24 @@ local force_update = param.get("force_update", atom.boolean) if class then - class = " " .. class + class = class .. " " else class = "" end -if config.fastpath_url_func then - ui.image{ - attr = { title = popup_text, class = "mdl-chip__contact member_image member_image_" .. image_type .. class }, - external = config.fastpath_url_func(member_id, image_type) +if image_type == "avatar" then + class = class .. "mdl-chip__contact " +end + +ui.image{ + attr = { title = popup_text, class = class .. " member_image member_image_" .. image_type }, + module = "member_image", + view = "show", + extension = "jpg", + id = member_id, + params = { + image_type = image_type, + dynamic = force_update and os.time() or nil } -else - local c = "mdl-chip__contact " - if image_type == "photo" then - c = "" - end - ui.image{ - attr = { title = popup_text, class = c .. "member_image member_image_" .. image_type .. class }, - module = "member_image", - view = "show", - extension = "jpg", - id = member_id, - params = { - image_type = image_type, - dynamic = force_update and os.time() or nil - } - } -end +} + diff -r d9ccd0d6ef8c -r 70121e414479 env/util/micro_avatar.lua --- a/env/util/micro_avatar.lua Mon Feb 08 14:28:28 2021 +0100 +++ b/env/util/micro_avatar.lua Mon Feb 08 14:45:13 2021 +0100 @@ -7,29 +7,19 @@ end local function doit() - if config.fastpath_url_func then - ui.image{ - attr = { - title = member.name, - class = "mdl-chip__contact" - }, - external = config.fastpath_url_func(member.id, "avatar") + ui.image { + attr = { + title = member.name, + class = "mdl-chip__contact" + }, + module = "member_image", + view = "show", + extension = "jpg", + id = member.id, + params = { + image_type = "avatar" } - else - ui.image { - attr = { - title = member.name, - class = "mdl-chip__contact" - }, - module = "member_image", - view = "show", - extension = "jpg", - id = member.id, - params = { - image_type = "avatar" - } - } - end + } ui.tag { attr = { class = "mdl-chip__text" }, content = member.name } end