Merge "users: Correct lock_password status visibility (Yes/No) in user details" into stable/ussuri

2 files changed, 2 insertions, 2 deletions

diff --git a/openstack_dashboard/dashboards/identity/users/tabs.py b/openstack_dashboard/dashboards/identity/users/tabs.py
index bd47925a5..ca6f71c64 100644
--- a/openstack_dashboard/dashboards/identity/users/tabs.py
+++ b/openstack_dashboard/dashboards/identity/users/tabs.py
@@ -76,11 +76,13 @@ class OverviewTab(tabs.Tab):
 
     def get_context_data(self, request):
         user = self.tab_group.kwargs['user']
+        options = getattr(user, 'options', {})
         return {
             "user": user,
             "domain_name": self._get_domain_name(user),
             'extras': self._get_extras(user),
             'project_name': self._get_project_name(user),
+            'lock_password': options.get('lock_password', False),
         }
 
 
diff --git a/openstack_dashboard/dashboards/identity/users/views.py b/openstack_dashboard/dashboards/identity/users/views.py
index 4abb538a2..2c810ae70 100644
--- a/openstack_dashboard/dashboards/identity/users/views.py
+++ b/openstack_dashboard/dashboards/identity/users/views.py
@@ -211,8 +211,6 @@ class DetailView(tabs.TabView):
         context["user"] = user
         context["url"] = self.get_redirect_url()
         context["actions"] = table.render_row_actions(user)
-        options = getattr(user, "options", {})
-        context["lock_password"] = options.get("lock_password", False)
         return context
 
     @memoized.memoized_method