Merge "Change column order for Orchestration Services table"

openstack · Dec 14, 2015 · 184a1e6 · 184a1e6
2 parents 5444338 + 0a6d9ce
commit 184a1e6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/openstack_dashboard/dashboards/admin/info/tables.py b/openstack_dashboard/dashboards/admin/info/tables.py
@@ -208,14 +208,16 @@ class HeatServiceTable(tables.DataTable):
     engine_id = tables.Column('engine_id', verbose_name=_('Engine Id'))
     host = tables.Column('host', verbose_name=_('Host'))
     topic = tables.Column('topic', verbose_name=_('Topic'))
+    # For consistent with other tables in system info, set column name to
+    # 'state'
+    state = tables.Column('status', verbose_name=_('State'),
+                          display_choices=SERVICE_STATE_DISPLAY_CHOICES)
     updated_at = tables.Column('updated_at',
                                verbose_name=pgettext_lazy(
                                    'Time since the last update',
                                    u'Last Updated'),
                                filters=(utils_filters.parse_isotime,
                                         filters.timesince))
-    status = tables.Column('status', verbose_name=_('Status'),
-                           display_choices=SERVICE_STATE_DISPLAY_CHOICES)
 
     def get_object_id(self, obj):
         return "%s" % obj.engine_id