# HG changeset patch # User bsw # Date 1341956429 -7200 # Node ID e3c2007828a18f126cfff7d5368d9899c90789d4 # Parent 9c714f697e4e72ba63de7a3b86e4bb87d329d2a5 Support for inactive units added to unit model diff -r 9c714f697e4e -r e3c2007828a1 model/unit.lua --- a/model/unit.lua Tue Jul 10 23:38:16 2012 +0200 +++ b/model/unit.lua Tue Jul 10 23:40:29 2012 +0200 @@ -94,8 +94,13 @@ end end -function Unit:get_flattened_tree() - local units = Unit:new_selector():add_order_by("name"):exec() +function Unit:get_flattened_tree(args) + local units_selector = Unit:new_selector() + :add_order_by("name") + if not args or not args.include_inactive then + units_selector:add_where("active") + end + local units = units_selector:exec() local unit_tree = {} for i, unit in ipairs(units) do if not unit.parent_id then