1.1 --- a/app/main/admin/area_show.lua	Tue Feb 07 17:54:00 2012 +0100
     1.2 +++ b/app/main/admin/area_show.lua	Tue Feb 07 18:13:00 2012 +0100
     1.3 @@ -2,6 +2,10 @@
     1.4  
     1.5  local area = Area:by_id(id) or Area:new()
     1.6  
     1.7 +if not area.unit_id then
     1.8 +  area.unit_id = param.get("unit_id", atom.integer)
     1.9 +end
    1.10 +
    1.11  slot.put_into("title", _"Create / edit area")
    1.12  
    1.13  slot.select("actions", function()
    1.14 @@ -9,7 +13,8 @@
    1.15      attr = { class = { "admin_only" } },
    1.16      text = _"Cancel",
    1.17      module = "admin",
    1.18 -    view = "area_list"
    1.19 +    view = "area_list",
    1.20 +    params = { unit_id = area.unit_id }
    1.21    }
    1.22  end)
    1.23  
    1.24 @@ -22,7 +27,8 @@
    1.25      default = {
    1.26        mode = "redirect",
    1.27        module = "admin",
    1.28 -      view = "area_list"
    1.29 +      view = "area_list",
    1.30 +      params = { unit_id = area.unit_id }
    1.31      }
    1.32    },
    1.33    id = id,
    1.34 @@ -38,8 +44,9 @@
    1.35        def_policy[#def_policy+1] = record
    1.36      end
    1.37  
    1.38 +    ui.field.hidden{ name = "unit_id", value = area.unit_id }
    1.39 +    ui.field.text{    label = _"Unit", value = area.unit.name, readonly = true }
    1.40      ui.field.text{    label = _"Name",        name = "name" }
    1.41 -    ui.field.boolean{ label = _"Active?",     name = "active" }
    1.42      ui.field.text{    label = _"Description", name = "description", multiline = true }
    1.43      ui.field.select{  label = _"Default Policy",   name = "default_policy",
    1.44                   value=area.default_policy and area.default_policy.id or "-1",
    1.45 @@ -54,6 +61,8 @@
    1.46                        connecting_records = area.allowed_policies or {},
    1.47                        foreign_reference  = "id",
    1.48      }
    1.49 +    slot.put("<br /><br />")
    1.50 +    ui.field.boolean{ label = _"Active?",     name = "active" }
    1.51      ui.submit{ text = _"Save" }
    1.52    end
    1.53  }