# HG changeset patch # User bsw # Date 1331482207 -3600 # Node ID c3b3a932f81f030d850756fb146e794293b836ef # Parent 6a082a234e21a0769f9fd0563b037ca4f96c574b Reordered member list filter diff -r 6a082a234e21 -r c3b3a932f81f app/main/member/_list.lua --- a/app/main/member/_list.lua Sun Mar 11 17:09:46 2012 +0100 +++ b/app/main/member/_list.lua Sun Mar 11 17:10:07 2012 +0100 @@ -19,39 +19,17 @@ ui.add_partial_param_names{ "member_list" } -local filter = { - name = "member_list", - { - name = "name", - label = _"A-Z", - selector_modifier = function(selector) selector:add_order_by("name") end - }, - { - name = "name_desc", - label = _"Z-A", - selector_modifier = function(selector) selector:add_order_by("name DESC") end - }, - { - name = "newest", - label = _"Newest", - selector_modifier = function(selector) selector:add_order_by("activated DESC, id DESC") end - }, - { - name = "oldest", - label = _"Oldest", - selector_modifier = function(selector) selector:add_order_by("activated, id") end - }, -} +local filter = { name = "member_list" } -if initiative then +if issue or initiative then if for_votes then - filter[#filter] = { + filter[#filter+1] = { name = "delegations", label = _"Delegations", selector_modifier = function(selector) selector:add_order_by("voter_weight DESC") end } else - filter[#filter] = { + filter[#filter+1] = { name = "delegations", label = _"Delegations", selector_modifier = function(selector) selector:add_order_by("weight DESC") end @@ -59,6 +37,28 @@ end end +filter[#filter+1] = { + name = "newest", + label = _"Newest", + selector_modifier = function(selector) selector:add_order_by("activated DESC, id DESC") end +} +filter[#filter+1] = { + name = "oldest", + label = _"Oldest", + selector_modifier = function(selector) selector:add_order_by("activated, id") end +} + +filter[#filter+1] = { + name = "name", + label = _"A-Z", + selector_modifier = function(selector) selector:add_order_by("name") end +} +filter[#filter+1] = { + name = "name_desc", + label = _"Z-A", + selector_modifier = function(selector) selector:add_order_by("name DESC") end +} + ui.filters{ label = _"Change order", selector = members_selector,