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