mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-10-23 23:44:13 +02:00
Merge pull request #786 from ispyisail/fix/remove-dead-exclude-bom-clause
Remove dead exclude_from_bom clause from ElementQueryWidget
This commit is contained in:
@@ -378,10 +378,10 @@ QString ElementQueryWidget::queryStr() const
|
|||||||
where.clear();
|
where.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString exclude_condition = "(exclude_from_bom IS NULL OR exclude_from_bom != '1')";
|
// exclude_from_bom is already filtered by element_nomenclature_view
|
||||||
|
// (see createElementNomenclatureView() in projectdatabase.cpp); this
|
||||||
filter_ += " AND " + exclude_condition;
|
// widget's query reads FROM that view, so a flagged element never
|
||||||
// -------------------------------------------------------------
|
// reaches this point in the first place.
|
||||||
|
|
||||||
if (where.isEmpty() && !filter_.isEmpty()) {
|
if (where.isEmpty() && !filter_.isEmpty()) {
|
||||||
filter_.remove(0, 4); //Remove the first " AND" of filter.
|
filter_.remove(0, 4); //Remove the first " AND" of filter.
|
||||||
|
|||||||
Reference in New Issue
Block a user