# HG changeset patch # User bsw # Date 1539875852 -7200 # Node ID 2fbf95bee3803249acf2d962e310aeb36337178a # Parent f27790f617c96ab41df02bff0d475dc98fe74483 Fixed missing closing end diff -r f27790f617c9 -r 2fbf95bee380 app/main/admin/index.lua --- a/app/main/admin/index.lua Thu Oct 18 17:16:44 2018 +0200 +++ b/app/main/admin/index.lua Thu Oct 18 17:17:32 2018 +0200 @@ -10,55 +10,56 @@ ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function() ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function() ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Organizational units and subject areas" } - ui.container{ attr = { class = "mdl-card__content" }, content = function() + ui.container{ attr = { class = "mdl-card__content" }, content = function() - for i_unit, unit in ipairs(units) do - ui.container { - attr = { style = "margin-left: " .. ((unit.depth - 1)* 2) .. "em;" }, - content = function () - ui.heading { level = 1, content = function () - local class - if unit.active == false then - class = "inactive" - end - ui.link{ attr = { class = class }, text = unit.name, module = "admin", view = "unit_edit", id = unit.id } - end } - ui.tag { tag = "ul", attr = { class = "ul" }, content = function () - local areas - if not inactive then - areas = unit:get_reference_selector("areas"):add_order_by("name"):add_where("active"):exec() - else - areas = unit:get_reference_selector("areas"):add_order_by("name"):exec() - end - for i, area in ipairs(areas) do + for i_unit, unit in ipairs(units) do + ui.container { + attr = { style = "margin-left: " .. ((unit.depth - 1)* 2) .. "em;" }, + content = function () + ui.heading { level = 1, content = function () + local class + if unit.active == false then + class = "inactive" + end + ui.link{ attr = { class = class }, text = unit.name, module = "admin", view = "unit_edit", id = unit.id } + end } + ui.tag { tag = "ul", attr = { class = "ul" }, content = function () + local areas + if not inactive then + areas = unit:get_reference_selector("areas"):add_order_by("name"):add_where("active"):exec() + else + areas = unit:get_reference_selector("areas"):add_order_by("name"):exec() + end + for i, area in ipairs(areas) do + ui.tag { tag = "li", content = function () + local class + if area.active == false then + class = "inactive" + end + ui.link{ attr = { class = class }, text = area.name, module = "admin", view = "area_show", id = area.id } + end } + end ui.tag { tag = "li", content = function () - local class - if area.active == false then - class = "inactive" - end - ui.link{ attr = { class = class }, text = area.name, module = "admin", view = "area_show", id = area.id } + ui.link { module = "admin", view = "area_show", params = { unit_id = unit.id }, content = _"+ add new subject area" } end } - end - ui.tag { tag = "li", content = function () - ui.link { module = "admin", view = "area_show", params = { unit_id = unit.id }, content = _"+ add new subject area" } + slot.put("
") end } - slot.put("
") - end } - end - } - end - - slot.put("
") - ui.link { module = "admin", view = "unit_edit", content = _"Create new unit" } - slot.put("
") - slot.put("
") - - if (not inactive) then - ui.link { module = "admin", view = "index", params = { inactive = true }, content = _"Show inactive" } - else - ui.link { module = "admin", view = "index", content = _"Hide inactive" } - end + end + } + end + + slot.put("
") + ui.link { module = "admin", view = "unit_edit", content = _"Create new unit" } + slot.put("
") + slot.put("
") + + if (not inactive) then + ui.link { module = "admin", view = "index", params = { inactive = true }, content = _"Show inactive" } + else + ui.link { module = "admin", view = "index", content = _"Hide inactive" } + end + end } end } end } end }