From bbb349af4a851c5ab3ae5cf74bc32df595d3d75d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Thu, 2 Nov 2017 18:11:22 -0200
Subject: [PATCH] Fix foreign key table always empty
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 templates/table/relation/common_form.twig     | 29 ++++++++++---------
 .../table/relation/relational_dropdown.twig   |  4 +--
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/templates/table/relation/common_form.twig b/templates/table/relation/common_form.twig
index 4e57d865f0..8dd30698b8 100644
--- a/templates/table/relation/common_form.twig
+++ b/templates/table/relation/common_form.twig
@@ -33,23 +33,24 @@
                     <th>{% trans 'Table' %}</th>
                     <th>{% trans 'Column' %}</th>
                 </tr></thead>
-                {# Foreign database dropdown #}
-                {% set foreign_db = one_key['ref_db_name'] is defined
-                    ? one_key['ref_db_name'] : db %}
-                {% set foreign_table = false %}
-                {% if foreign_db %}
-                    {% set foreign_table = one_key['ref_table_name'] is defined
-                        ? one_key['ref_table_name'] : false %}
-                {% endif %}
-                {% set unique_columns = [] %}
-                {% if foreign_db and foreign_table %}
-                    {% set table_obj = Table_get(foreign_table, foreign_db) %}
-                    {% set unique_columns = table_obj.getUniqueColumns(false, false) %}
-                {% endif %}
-
                 {% set i = 0 %}
                 {% if existrel_foreign is not empty %}
                     {% for key, one_key in existrel_foreign %}
+                        {# Foreign database dropdown #}
+                        {% set foreign_db = one_key['ref_db_name'] is defined
+                            and one_key['ref_db_name'] is not null
+                            ? one_key['ref_db_name'] : db %}
+                        {% set foreign_table = false %}
+                        {% if foreign_db %}
+                            {% set foreign_table = one_key['ref_table_name'] is defined
+                                and one_key['ref_table_name'] is not null
+                                ? one_key['ref_table_name'] : false %}
+                        {% endif %}
+                        {% set unique_columns = [] %}
+                        {% if foreign_db and foreign_table %}
+                            {% set table_obj = Table_get(foreign_table, foreign_db) %}
+                            {% set unique_columns = table_obj.getUniqueColumns(false, false) %}
+                        {% endif %}
                         {% include 'table/relation/foreign_key_row.twig' with {
                             'i': i,
                             'one_key': one_key,
diff --git a/templates/table/relation/relational_dropdown.twig b/templates/table/relation/relational_dropdown.twig
index 404b6c9cfb..9d5f3c979f 100644
--- a/templates/table/relation/relational_dropdown.twig
+++ b/templates/table/relation/relational_dropdown.twig
@@ -3,14 +3,14 @@
     {% set seen_key = false %}
     {% for value in values %}
         <option value="{{ value }}"
-            {%- if foreign != false and value == foreign %}
+            {%- if foreign is not same as(false) and value == foreign %}
                 selected="selected"
                 {%- set seen_key = true -%}
             {%- endif %}>
             {{ value }}
         </option>
     {% endfor %}
-    {% if foreign != false and not seen_key %}
+    {% if foreign is not same as(false) and not seen_key %}
         <option value="{{ foreign }}" selected="selected">
             {{ foreign }}
         </option>