From dd035a4c7bb38594abb386591b64b8c42d2d3a20 Mon Sep 17 00:00:00 2001
From: loganhz <logan@rancher.com>
Date: Sun, 27 Jan 2019 06:21:26 +0800
Subject: [PATCH] Fix the issue that users have to refresh the page to see the
 ingress detail page

---
 app/components/new-edit-ingress/template.hbs                  | 1 +
 app/ingress/template.hbs                                      | 1 +
 app/ingresses/run/template.hbs                                | 1 -
 .../addon/components/form-ingress-backends/template.hbs       | 4 ++--
 lib/shared/addon/components/form-ingress-rows/template.hbs    | 1 +
 lib/shared/addon/components/form-ingress-rule/template.hbs    | 1 +
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/components/new-edit-ingress/template.hbs b/app/components/new-edit-ingress/template.hbs
index c9d4cb8ba..38c05276d 100644
--- a/app/components/new-edit-ingress/template.hbs
+++ b/app/components/new-edit-ingress/template.hbs
@@ -25,6 +25,7 @@
   {{form-ingress-rule
       editing=true
       ingress=ingress
+      namespace=namespace
   }}
   <hr class="mt-30 mb-30" />
 </section>
diff --git a/app/ingress/template.hbs b/app/ingress/template.hbs
index 50aff0245..5d7a4a6f1 100644
--- a/app/ingress/template.hbs
+++ b/app/ingress/template.hbs
@@ -19,6 +19,7 @@
 <section class="mt-40 horizontal-form container-fluid">
   {{form-ingress-rule
       ingress=model.ingress
+      namespace=model.ingress.namespace
       editing=false
   }}
 </section>
diff --git a/app/ingresses/run/template.hbs b/app/ingresses/run/template.hbs
index bfa8ee1d0..56a2f6be1 100644
--- a/app/ingresses/run/template.hbs
+++ b/app/ingresses/run/template.hbs
@@ -5,6 +5,5 @@
     editing=true
     existing=model.existing
     ingress=model.ingress
-    namespace=model.ingress.namespace
     namespacedCertificates=model.namespacedcertificates
 }}
diff --git a/lib/shared/addon/components/form-ingress-backends/template.hbs b/lib/shared/addon/components/form-ingress-backends/template.hbs
index 276158596..f6bd9e76a 100644
--- a/lib/shared/addon/components/form-ingress-backends/template.hbs
+++ b/lib/shared/addon/components/form-ingress-backends/template.hbs
@@ -53,7 +53,7 @@
                   obj=path.service
                   selectClass="input-sm"
                   selected=path.serviceId
-                  selectedNamespace=ingress.namespace
+                  selectedNamespace=namespace
               }}
             {{else if (eq path.backendType 'workload')}}
               {{schema/input-workload
@@ -61,7 +61,7 @@
                   readOnly=(not editing)
                   selectClass="input-sm"
                   selected=path.serviceId
-                  selectedNamespace=ingress.namespace
+                  selectedNamespace=namespace
               }}
             {{/if}}
           </td>
diff --git a/lib/shared/addon/components/form-ingress-rows/template.hbs b/lib/shared/addon/components/form-ingress-rows/template.hbs
index 643f4c3ac..31e6287f7 100644
--- a/lib/shared/addon/components/form-ingress-rows/template.hbs
+++ b/lib/shared/addon/components/form-ingress-rows/template.hbs
@@ -86,6 +86,7 @@
 
   {{form-ingress-backends
       ingress=ingress
+      namespace=namespace
       isDefault=isDefault
       rule=rule
       editing=editing
diff --git a/lib/shared/addon/components/form-ingress-rule/template.hbs b/lib/shared/addon/components/form-ingress-rule/template.hbs
index 045000be1..526ff3edb 100644
--- a/lib/shared/addon/components/form-ingress-rule/template.hbs
+++ b/lib/shared/addon/components/form-ingress-rule/template.hbs
@@ -6,6 +6,7 @@
   {{form-ingress-rows
       editing=editing
       ingress=ingress
+      namespace=namespace
       removeRule=(action 'removeRule')
       rule=rule
       rules=rules