Line 114: |
Line 114: |
| if v._suffix then | | if v._suffix then |
| if (allowedRemodels == nil or allowedRemodels[v._suffix]) then | | if (allowedRemodels == nil or allowedRemodels[v._suffix]) then |
− | local name = string.format("%s/%s", v._name, v._suffix) | + | local fullName = string.format("%s/%s", v._name, v._suffix) |
| collection[index] = v | | collection[index] = v |
| + | collection[index]._fullName = fullName |
| index = index + 1 | | index = index + 1 |
| end | | end |
| elseif v._id then | | elseif v._id then |
| if v._remodel_from or (v._name and listBase) then | | if v._remodel_from or (v._name and listBase) then |
− | collection[index] = v
| + | collection[index] = v |
| + | collection[index]._fullName = v._name |
| index = index + 1 | | index = index + 1 |
| end | | end |
Line 130: |
Line 132: |
| local sortKey = stringKey('sort', context, n) | | local sortKey = stringKey('sort', context, n) |
| if sortKey then | | if sortKey then |
− | table.sort(collection, function(a, b) | + | table.sort(collection, function(a, b) |
| if a[sortKey] ~= b[sortKey] then | | if a[sortKey] ~= b[sortKey] then |
| return a[sortKey] < b[sortKey] | | return a[sortKey] < b[sortKey] |
Line 165: |
Line 167: |
| end | | end |
| end | | end |
− | current = e._name | + | current = e._fullName |
| if nItems and not current then | | if nItems and not current then |
| current = '-' | | current = '-' |