0
1
Fork 0

Addresses without province or country are now visible

This commit is contained in:
Juan 2018-09-13 13:23:50 +02:00
parent c77373e772
commit 38a6a7a3ac
4 changed files with 4 additions and 6 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (1.406.19) stable; urgency=low hedera-web (1.406.20) stable; urgency=low
* Initial Release. * Initial Release.

View File

@ -11,10 +11,9 @@
<db-model id="addresses" updatable="true"> <db-model id="addresses" updatable="true">
<custom> <custom>
SELECT a.id, a.nickname, p.name province, a.postalCode, SELECT a.id, a.nickname, p.name province, a.postalCode,
a.city, a.street, a.isActive, c.country a.city, a.street, a.isActive
FROM myAddress a FROM myAddress a
LEFT JOIN vn.province p ON p.id = a.provinceFk LEFT JOIN vn.province p ON p.id = a.provinceFk
JOIN vn.country c ON c.id = p.countryFk
WHERE a.isActive WHERE a.isActive
</custom> </custom>
</db-model> </db-model>

View File

@ -10,10 +10,9 @@
mode="ON_DEMAND" mode="ON_DEMAND"
on-operations-done="onOperationsDone"> on-operations-done="onOperationsDone">
SELECT a.id, a.street, a.nickname, a.city, SELECT a.id, a.street, a.nickname, a.city,
a.postalCode, a.provinceFk, c.id countryFk a.postalCode, a.provinceFk, p.countryFk
FROM myAddress a FROM myAddress a
LEFT JOIN vn.province p ON p.id = a.provinceFk LEFT JOIN vn.province p ON p.id = a.provinceFk
JOIN vn.country c ON c.id = p.countryFk
WHERE a.id = #address WHERE a.id = #address
<sql-batch property="batch"> <sql-batch property="batch">
<custom> <custom>

View File

@ -1,6 +1,6 @@
{ {
"name": "hedera-web", "name": "hedera-web",
"version": "1.406.19", "version": "1.406.20",
"description": "Verdnatura web page", "description": "Verdnatura web page",
"license": "GPL-3.0", "license": "GPL-3.0",
"repository": { "repository": {