Reconciliation UI: property not included if checkbox unchecked (#2413)
solves #2230
This commit is contained in:
parent
c20dc69294
commit
afd5cf70f0
@ -197,7 +197,7 @@ ReconStandardServicePanel.prototype._populatePanel = function() {
|
|||||||
var td2 = tr.insertCell(2);
|
var td2 = tr.insertCell(2);
|
||||||
|
|
||||||
$(td0).html(column.name);
|
$(td0).html(column.name);
|
||||||
$('<input type="checkbox" />')
|
$('<input type="checkbox" name="include" />')
|
||||||
.attr("columnName", column.name)
|
.attr("columnName", column.name)
|
||||||
.appendTo(td1);
|
.appendTo(td1);
|
||||||
$('<input size="25" name="property" />')
|
$('<input size="25" name="property" />')
|
||||||
@ -273,6 +273,7 @@ ReconStandardServicePanel.prototype.start = function() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var choices = this._panel.find('input[name="type-choice"]:checked');
|
var choices = this._panel.find('input[name="type-choice"]:checked');
|
||||||
|
var include = this._panel.find('input[name="include"]');
|
||||||
if (choices !== null && choices.length > 0) {
|
if (choices !== null && choices.length > 0) {
|
||||||
if (choices[0].value == '-') {
|
if (choices[0].value == '-') {
|
||||||
type = null;
|
type = null;
|
||||||
@ -287,9 +288,9 @@ ReconStandardServicePanel.prototype.start = function() {
|
|||||||
var columnDetails = [];
|
var columnDetails = [];
|
||||||
$.each(
|
$.each(
|
||||||
this._panel.find('input[name="property"]'),
|
this._panel.find('input[name="property"]'),
|
||||||
function() {
|
function(index) {
|
||||||
var property = $(this).data("data.suggest");
|
var property = $(this).data("data.suggest");
|
||||||
if (property && property.id) {
|
if (property && property.id && include[index].checked) {
|
||||||
columnDetails.push({
|
columnDetails.push({
|
||||||
column: this.getAttribute("columnName"),
|
column: this.getAttribute("columnName"),
|
||||||
property: {
|
property: {
|
||||||
@ -299,7 +300,7 @@ ReconStandardServicePanel.prototype.start = function() {
|
|||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
var property = $.trim(this.value);
|
var property = $.trim(this.value);
|
||||||
if (property) {
|
if (property && include[index].checked) {
|
||||||
columnDetails.push({
|
columnDetails.push({
|
||||||
column: this.getAttribute("columnName"),
|
column: this.getAttribute("columnName"),
|
||||||
property: {
|
property: {
|
||||||
|
Loading…
Reference in New Issue
Block a user