diff options
author | Jo-Philipp Wich <jo@mein.io> | 2020-02-12 08:16:06 +0100 |
---|---|---|
committer | Jo-Philipp Wich <jo@mein.io> | 2020-02-12 11:59:41 +0100 |
commit | 9bb78b5cd842f94cbcaf00cc5b19c1e3b9669d93 (patch) | |
tree | 60d47fcb3d14242da088a322fccffe3357a2b9d1 /modules/luci-base | |
parent | bf774e4c2a6a03aa01d4bcd9f5ce4f960cd91874 (diff) |
luci-base: form.js: rendering fixes for grid sections
- Ensure that last header cell is rendered for grid sections without
sorting or addremove actions
- Don't skip header cells for optional options
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'modules/luci-base')
-rw-r--r-- | modules/luci-base/htdocs/luci-static/resources/form.js | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/modules/luci-base/htdocs/luci-static/resources/form.js b/modules/luci-base/htdocs/luci-static/resources/form.js index 4ce5e45ebe..80b1393d5f 100644 --- a/modules/luci-base/htdocs/luci-static/resources/form.js +++ b/modules/luci-base/htdocs/luci-static/resources/form.js @@ -1104,7 +1104,7 @@ var CBITableSection = CBITypedSection.extend({ return sectionEl; }, - renderHeaderRows: function(max_cols) { + renderHeaderRows: function(max_cols, has_action) { var has_titles = false, has_descriptions = false, max_cols = isNaN(this.max_cols) ? this.children.length : this.max_cols, @@ -1113,7 +1113,7 @@ var CBITableSection = CBITypedSection.extend({ trEls = E([]); for (var i = 0, opt; i < max_cols && (opt = this.children[i]) != null; i++) { - if (opt.optional || opt.modalonly) + if (opt.modalonly) continue; has_titles = has_titles || !!opt.title; @@ -1127,7 +1127,7 @@ var CBITableSection = CBITypedSection.extend({ }); for (var i = 0, opt; i < max_cols && (opt = this.children[i]) != null; i++) { - if (opt.optional || opt.modalonly) + if (opt.modalonly) continue; trEl.appendChild(E('div', { @@ -1149,7 +1149,7 @@ var CBITableSection = CBITypedSection.extend({ L.dom.content(trEl.lastElementChild, opt.title); } - if (this.sortable || this.extedit || this.addremove || has_more) + if (this.sortable || this.extedit || this.addremove || has_more || has_action) trEl.appendChild(E('div', { 'class': 'th cbi-section-table-cell cbi-section-actions' })); @@ -1163,7 +1163,7 @@ var CBITableSection = CBITypedSection.extend({ }); for (var i = 0, opt; i < max_cols && (opt = this.children[i]) != null; i++) { - if (opt.optional || opt.modalonly) + if (opt.modalonly) continue; trEl.appendChild(E('div', { @@ -1477,6 +1477,10 @@ var CBIGridSection = CBITableSection.extend({ }, (value != null) ? value : E('em', _('none'))); }, + renderHeaderRows: function(section_id) { + return this.super('renderHeaderRows', [ NaN, true ]); + }, + renderRowActions: function(section_id) { return this.super('renderRowActions', [ section_id, _('Edit') ]); }, |