1.1 --- a/app/main/delegation/_list.lua	Mon Feb 01 21:33:35 2021 +0100
     1.2 +++ b/app/main/delegation/_list.lua	Mon Feb 01 21:45:52 2021 +0100
     1.3 @@ -21,17 +21,17 @@
     1.4        ui.container { attr = { style = "float: left;" }, content = function()
     1.5          ui.link{
     1.6            content = unit.name,
     1.7 -          module = "unit",
     1.8 -          view = "show",
     1.9 -          id = unit.id
    1.10 +          module = "index",
    1.11 +          view = "index",
    1.12 +          params = { unit = unit.id }
    1.13          }
    1.14          if area then
    1.15            slot.put(" · ")
    1.16            ui.link{
    1.17              content = area.name,
    1.18 -            module = "area",
    1.19 -            view = "show",
    1.20 -            id = area.id
    1.21 +            module = "index",
    1.22 +            view = "index",
    1.23 +            params = { unit = area.unit_id, area = area.id }
    1.24            }
    1.25          end
    1.26          if delegation.issue then
    1.27 @@ -48,41 +48,39 @@
    1.28    }
    1.29  end
    1.30  
    1.31 +local last_scope = {}
    1.32 +for i, delegation in ipairs(delegations_selector:exec()) do
    1.33 +  if last_scope.unit_id ~= delegation.unit_id
    1.34 +    or last_scope.area_id ~= delegation.area_id
    1.35 +    or last_scope.issue_id ~= delegation.issue_id
    1.36 +  then
    1.37 +    last_scope.unit_id = delegation.unit_id
    1.38 +    last_scope.area_id = delegation.area_id
    1.39 +    last_scope.issue_id = delegation.issue_id
    1.40 +    delegation_scope(delegation)
    1.41 +  end
    1.42 +  if incoming then
    1.43 +    execute.view{
    1.44 +      module = "member",
    1.45 +      view = "_show_thumb",
    1.46 +      params = {
    1.47 +        member = delegation.truster
    1.48 +      }
    1.49 +    }
    1.50 +  elseif delegation.trustee then
    1.51 +    ui.image{
    1.52 +      attr = { class = "delegation_arrow" },
    1.53 +      static = "delegation_arrow_24_horizontal.png"
    1.54 +    }
    1.55 +    execute.view{
    1.56 +      module = "member",
    1.57 +      view = "_show_thumb",
    1.58 +      params = {
    1.59 +        member = delegation.trustee
    1.60 +      }
    1.61 +    }
    1.62 +  else
    1.63 +    ui.tag{ content = _"Delegation abandoned" }
    1.64 +  end
    1.65 +end
    1.66  
    1.67 ---ui.paginate{
    1.68 ---  selector = delegations_selector,
    1.69 ---  name = incoming and "delegation_incoming" or "delegation_outgoing",
    1.70 ---  content = function()
    1.71 -    local last_scope = {}
    1.72 -    for i, delegation in ipairs(delegations_selector:exec()) do
    1.73 -      if last_scope.unit_id ~= delegation.unit_id
    1.74 -        or last_scope.area_id ~= delegation.area_id
    1.75 -        or last_scope.issue_id ~= delegation.issue_id
    1.76 -      then
    1.77 -        last_scope.unit_id = delegation.unit_id
    1.78 -        last_scope.area_id = delegation.area_id
    1.79 -        last_scope.issue_id = delegation.issue_id
    1.80 -        delegation_scope(delegation)
    1.81 -      end
    1.82 -      if incoming then
    1.83 -        execute.view{ module = "member_image", view = "_show", params = {
    1.84 -          member_id = delegation.truster_id, class = "micro_avatar", popup_text = delegation.truster.name,
    1.85 -          image_type = "avatar", show_dummy = true,
    1.86 -        } }
    1.87 -        ui.link{ module = "member", view = "show", id = delegation.truster_id, content = delegation.truster.name }
    1.88 -      elseif delegation.trustee then
    1.89 -        ui.image{
    1.90 -          attr = { class = "delegation_arrow" },
    1.91 -          static = "delegation_arrow_24_horizontal.png"
    1.92 -        }
    1.93 -        execute.view{ module = "member_image", view = "_show", params = {
    1.94 -          member_id = delegation.trustee_id, class = "micro_avatar", popup_text = delegation.trustee.name,
    1.95 -          image_type = "avatar", show_dummy = true,
    1.96 -        } }
    1.97 -        ui.link{ module = "member", view = "show", id = delegation.trustee_id, content = delegation.trustee.name }
    1.98 -      else
    1.99 -        ui.tag{ content = _"Delegation abandoned" }
   1.100 -      end
   1.101 -    end
   1.102 ---  end
   1.103 ---}