1.1 --- a/app/main/admin/area_show.lua	Mon Nov 08 02:39:30 2010 +0100
     1.2 +++ b/app/main/admin/area_show.lua	Mon Nov 08 15:04:44 2010 +0100
     1.3 @@ -1,11 +1,17 @@
     1.4  local id = param.get_id()
     1.5  
     1.6 -local area
     1.7 -if id then
     1.8 -  area = Area:new_selector():add_where{ "id = ?", id }:single_object_mode():exec()
     1.9 -end
    1.10 +local area = Area:by_id(id) or Area:new()
    1.11 +
    1.12 +slot.put_into("title", _"Create / edit area")
    1.13  
    1.14 -slot.put_into("title", _"Create new area")
    1.15 +slot.select("actions", function()
    1.16 +  ui.link{
    1.17 +    attr = { class = { "admin_only" } },
    1.18 +    text = _"Cancel",
    1.19 +    module = "admin",
    1.20 +    view = "area_list"
    1.21 +  }
    1.22 +end)
    1.23  
    1.24  ui.form{
    1.25    attr = { class = "vertical" },
    1.26 @@ -19,9 +25,9 @@
    1.27        view = "area_list"
    1.28      }
    1.29    },
    1.30 -  id = area and area.id or nil,
    1.31 +  id = id,
    1.32    content = function()
    1.33 -    policies = Policy:new_selector():add_where{ "active='t'"}:exec()
    1.34 +    policies = Policy:build_selector{ active = true }:exec()
    1.35      local def_policy = {
    1.36        {
    1.37          id = "-1",
    1.38 @@ -35,7 +41,7 @@
    1.39      ui.field.text{    label = _"Name",        name = "name" }
    1.40      ui.field.boolean{ label = _"Active?",     name = "active" }
    1.41      ui.field.text{    label = _"Description", name = "description", multiline = true }
    1.42 -    ui.field.select{   label = _"Default Policy",   name = "default_policy",
    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                   foreign_records = def_policy,
    1.46                   foreign_id      = "id",
    1.47 @@ -45,8 +51,9 @@
    1.48                        foreign_records = policies,
    1.49                        foreign_id      = "id",
    1.50                        foreign_name    = "name",
    1.51 -                      connecting_records = area.allowed_policies,
    1.52 -                      foreign_reference  = "id" }
    1.53 +                      connecting_records = area.allowed_policies or {},
    1.54 +                      foreign_reference  = "id",
    1.55 +    }
    1.56      ui.submit{ text = _"Save" }
    1.57    end
    1.58  }