Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post hidden data on update if it is flaged as editable #5262

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 23 additions & 5 deletions src/Presentation/Nop.Web/Areas/Admin/Views/Shared/Table.cshtml
Expand Up @@ -262,12 +262,19 @@
updateRowData_@(tableName)(dataId, origData, nameData);
}

function updateRowData_@(tableName)(currentCells, data, nameData) {
function updateRowData_@(tableName)(row, data, nameData) {
var updateRowData = [];
updateRowData.push({ 'pname': nameData, 'pvalue': data });
$.each(columnData_@(tableName), function (index, element) {
if (element.Editable == true) {
var value = $($($(currentCells).children("[data-columnname='" + element.Data + "']")).children('input')[0]).val();
var value = $($($(row).children("[data-columnname='" + element.Data + "']")).children('input')[0]).val();
if (value === undefined) {
var dtVal = getValueFromDataTable('#@Model.Name', row, element.Data);
if (dtVal !== undefined) {

value = dtVal;
}
}
if (element.Type == 'number') {
value = new Intl.NumberFormat('@currentCulture', { useGrouping: false }).format(value);
}
Expand Down Expand Up @@ -326,11 +333,22 @@
}
}

function saveRowIntoArray_@(tableName)(cureentCells) {
function saveRowIntoArray_@(tableName)(row) {
$.each(columnData_@(tableName), function (index, element) {
if (element.Editable == true) {
var htmlVal = $($(cureentCells).children("[data-columnname='" + element.Data + "']")[0]).html();
editRowData_@(tableName)[element.Data] = htmlVal;
var htmlVal = $($(row).children("[data-columnname='" + element.Data + "']")[0]).html();
if (htmlVal === undefined) {
var val=getValueFromDataTable('#@Model.Name',row,element.Data);
if (val !== undefined) {

editRowData_@(tableName)[element.Data] = val;
}

}
else {
editRowData_@(tableName)[element.Data] = htmlVal;

}
}
});
}
Expand Down
12 changes: 12 additions & 0 deletions src/Presentation/Nop.Web/wwwroot/js/admin.table.js
Expand Up @@ -62,4 +62,16 @@ function updateTableWidth(tableSelector) {
if ($.fn.DataTable.isDataTable(tableSelector)) {
$(tableSelector).DataTable().columns.adjust();
}
}
function getValueFromDataTable(tableSelector, row, columnName) {
var val = $.grep($(tableSelector).DataTable().settings()[0].aoColumns,
function (c, i) {
return (!c.bVisible && c.data === columnName);
});
if (val !== undefined) {
var rowData = $(tableSelector).DataTable().row(row[0]).data()[columnName];

return rowData;
}
return undefined;
}