Merge branch '2.3' into 2.4

2020-06-02 10:41:08 +03:00
parent 922630f76f cb8b4546cb
commit 727aeb4a08
7 changed files with 82 additions and 61 deletions
--- a/maxctrl/lib/common.js
+++ b/maxctrl/lib/common.js
@ -197,7 +197,7 @@ module.exports = function() {
                row = []

                fields.forEach(function(p) {
-                    var v = _.getPath(i, p[p.name], '')
+                    var v = _.getPath(i, p.path, '')

                    if (Array.isArray(v) && typeof(v[0]) != 'object') {
                        v = v.join(', ')