liquid_feedback_frontend
changeset 1632:70121e414479
Removed fastpath related code
author | bsw |
---|---|
date | Mon Feb 08 14:45:13 2021 +0100 (2021-02-08) |
parents | d9ccd0d6ef8c |
children | 35e605322b41 |
files | app/main/member_image/_show.lua env/util/micro_avatar.lua |
line diff
1.1 --- a/app/main/member_image/_show.lua Mon Feb 08 14:28:28 2021 +0100 1.2 +++ b/app/main/member_image/_show.lua Mon Feb 08 14:45:13 2021 +0100 1.3 @@ -8,30 +8,24 @@ 1.4 local force_update = param.get("force_update", atom.boolean) 1.5 1.6 if class then 1.7 - class = " " .. class 1.8 + class = class .. " " 1.9 else 1.10 class = "" 1.11 end 1.12 1.13 -if config.fastpath_url_func then 1.14 - ui.image{ 1.15 - attr = { title = popup_text, class = "mdl-chip__contact member_image member_image_" .. image_type .. class }, 1.16 - external = config.fastpath_url_func(member_id, image_type) 1.17 +if image_type == "avatar" then 1.18 + class = class .. "mdl-chip__contact " 1.19 +end 1.20 + 1.21 +ui.image{ 1.22 + attr = { title = popup_text, class = class .. " member_image member_image_" .. image_type }, 1.23 + module = "member_image", 1.24 + view = "show", 1.25 + extension = "jpg", 1.26 + id = member_id, 1.27 + params = { 1.28 + image_type = image_type, 1.29 + dynamic = force_update and os.time() or nil 1.30 } 1.31 -else 1.32 - local c = "mdl-chip__contact " 1.33 - if image_type == "photo" then 1.34 - c = "" 1.35 - end 1.36 - ui.image{ 1.37 - attr = { title = popup_text, class = c .. "member_image member_image_" .. image_type .. class }, 1.38 - module = "member_image", 1.39 - view = "show", 1.40 - extension = "jpg", 1.41 - id = member_id, 1.42 - params = { 1.43 - image_type = image_type, 1.44 - dynamic = force_update and os.time() or nil 1.45 - } 1.46 - } 1.47 -end 1.48 +} 1.49 +
2.1 --- a/env/util/micro_avatar.lua Mon Feb 08 14:28:28 2021 +0100 2.2 +++ b/env/util/micro_avatar.lua Mon Feb 08 14:45:13 2021 +0100 2.3 @@ -7,29 +7,19 @@ 2.4 end 2.5 2.6 local function doit() 2.7 - if config.fastpath_url_func then 2.8 - ui.image{ 2.9 - attr = { 2.10 - title = member.name, 2.11 - class = "mdl-chip__contact" 2.12 - }, 2.13 - external = config.fastpath_url_func(member.id, "avatar") 2.14 + ui.image { 2.15 + attr = { 2.16 + title = member.name, 2.17 + class = "mdl-chip__contact" 2.18 + }, 2.19 + module = "member_image", 2.20 + view = "show", 2.21 + extension = "jpg", 2.22 + id = member.id, 2.23 + params = { 2.24 + image_type = "avatar" 2.25 } 2.26 - else 2.27 - ui.image { 2.28 - attr = { 2.29 - title = member.name, 2.30 - class = "mdl-chip__contact" 2.31 - }, 2.32 - module = "member_image", 2.33 - view = "show", 2.34 - extension = "jpg", 2.35 - id = member.id, 2.36 - params = { 2.37 - image_type = "avatar" 2.38 - } 2.39 - } 2.40 - end 2.41 + } 2.42 ui.tag { attr = { class = "mdl-chip__text" }, content = member.name } 2.43 end 2.44