Merge remote-tracking branch 'origin/pr/170'

* origin/pr/170:
  Fix error on reverting Qube Manager to an older version
This commit is contained in:
Marek Marczykowski-Górecki 2019-04-04 01:28:35 +02:00
commit f4d0417e1a
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -626,8 +626,16 @@ class VmManagerWindow(ui_qubemanager.Ui_VmManagerWindow, QtGui.QMainWindow):
self.sort_order = QtCore.Qt.SortOrder( self.sort_order = QtCore.Qt.SortOrder(
self.manager_settings.value("view/sort_order", self.manager_settings.value("view/sort_order",
defaultValue=self.sort_order)) defaultValue=self.sort_order))
try:
self.table.sortItems(self.columns_indices[self.sort_by_column], self.table.sortItems(self.columns_indices[self.sort_by_column],
self.sort_order) self.sort_order)
except KeyError:
# the manager was sorted on a column that does not exist in the
# current version; possible only with downgrades
self.table.sortItems(self.columns_indices["Name"],
self.sort_order)
if not self.manager_settings.value("view/menubar_visible", if not self.manager_settings.value("view/menubar_visible",
defaultValue=True): defaultValue=True):
self.action_menubar.setChecked(False) self.action_menubar.setChecked(False)