1.1 --- a/app/main/admin/index.lua	Thu Oct 18 17:16:44 2018 +0200
     1.2 +++ b/app/main/admin/index.lua	Thu Oct 18 17:17:32 2018 +0200
     1.3 @@ -10,55 +10,56 @@
     1.4      ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
     1.5        ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
     1.6          ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Organizational units and subject areas" }
     1.7 -      ui.container{ attr = { class = "mdl-card__content" }, content = function()
     1.8 +        ui.container{ attr = { class = "mdl-card__content" }, content = function()
     1.9  
    1.10 -        for i_unit, unit in ipairs(units) do
    1.11 -          ui.container { 
    1.12 -            attr = { style = "margin-left: " .. ((unit.depth - 1)* 2) .. "em;" },
    1.13 -            content = function ()
    1.14 -              ui.heading { level = 1, content = function ()
    1.15 -                local class
    1.16 -                if unit.active == false then
    1.17 -                  class = "inactive"
    1.18 -                end
    1.19 -                ui.link{ attr = { class = class }, text = unit.name, module = "admin", view = "unit_edit", id = unit.id }
    1.20 -              end }
    1.21 -              ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
    1.22 -                local areas
    1.23 -                if not inactive then
    1.24 -                  areas = unit:get_reference_selector("areas"):add_order_by("name"):add_where("active"):exec()
    1.25 -                else
    1.26 -                  areas = unit:get_reference_selector("areas"):add_order_by("name"):exec()
    1.27 -                end
    1.28 -                for i, area in ipairs(areas) do
    1.29 +          for i_unit, unit in ipairs(units) do
    1.30 +            ui.container { 
    1.31 +              attr = { style = "margin-left: " .. ((unit.depth - 1)* 2) .. "em;" },
    1.32 +              content = function ()
    1.33 +                ui.heading { level = 1, content = function ()
    1.34 +                  local class
    1.35 +                  if unit.active == false then
    1.36 +                    class = "inactive"
    1.37 +                  end
    1.38 +                  ui.link{ attr = { class = class }, text = unit.name, module = "admin", view = "unit_edit", id = unit.id }
    1.39 +                end }
    1.40 +                ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
    1.41 +                  local areas
    1.42 +                  if not inactive then
    1.43 +                    areas = unit:get_reference_selector("areas"):add_order_by("name"):add_where("active"):exec()
    1.44 +                  else
    1.45 +                    areas = unit:get_reference_selector("areas"):add_order_by("name"):exec()
    1.46 +                  end
    1.47 +                  for i, area in ipairs(areas) do
    1.48 +                    ui.tag { tag = "li", content = function ()
    1.49 +                      local class
    1.50 +                      if area.active == false then
    1.51 +                        class = "inactive"
    1.52 +                      end
    1.53 +                      ui.link{ attr = { class = class }, text = area.name, module = "admin", view = "area_show", id = area.id }
    1.54 +                    end }
    1.55 +                  end
    1.56                    ui.tag { tag = "li", content = function ()
    1.57 -                    local class
    1.58 -                    if area.active == false then
    1.59 -                      class = "inactive"
    1.60 -                    end
    1.61 -                    ui.link{ attr = { class = class }, text = area.name, module = "admin", view = "area_show", id = area.id }
    1.62 +                    ui.link { module = "admin", view = "area_show", params = { unit_id = unit.id }, content = _"+ add new subject area" }
    1.63                    end }
    1.64 -                end
    1.65 -                ui.tag { tag = "li", content = function ()
    1.66 -                  ui.link { module = "admin", view = "area_show", params = { unit_id = unit.id }, content = _"+ add new subject area" }
    1.67 +                  slot.put("<br />")
    1.68                  end }
    1.69 -                slot.put("<br />")
    1.70 -              end }
    1.71 -            end
    1.72 -          }
    1.73 -        end
    1.74 -        
    1.75 -        slot.put("<br />")
    1.76 -        ui.link { module = "admin", view = "unit_edit", content = _"Create new unit" }
    1.77 -        slot.put("<br />")
    1.78 -        slot.put("<br />")
    1.79 -        
    1.80 -        if (not inactive) then
    1.81 -          ui.link { module = "admin", view = "index", params = { inactive = true }, content = _"Show inactive" }
    1.82 -        else
    1.83 -          ui.link { module = "admin", view = "index", content = _"Hide inactive" }
    1.84 -        end
    1.85 +              end
    1.86 +            }
    1.87 +          end
    1.88 +          
    1.89 +          slot.put("<br />")
    1.90 +          ui.link { module = "admin", view = "unit_edit", content = _"Create new unit" }
    1.91 +          slot.put("<br />")
    1.92 +          slot.put("<br />")
    1.93 +          
    1.94 +          if (not inactive) then
    1.95 +            ui.link { module = "admin", view = "index", params = { inactive = true }, content = _"Show inactive" }
    1.96 +          else
    1.97 +            ui.link { module = "admin", view = "index", content = _"Hide inactive" }
    1.98 +          end
    1.99        
   1.100 +         end }
   1.101        end }
   1.102      end }
   1.103    end }