Merge remote-tracking branch 'qubesos/pr/105'

* qubesos/pr/105:
  Remove templates from listing in UpdateVM and ClockVm in Global Settings
This commit is contained in:
Marek Marczykowski-Górecki 2018-07-12 23:41:47 +02:00
commit 5e4ac80ed2
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724

View File

@ -63,13 +63,15 @@ class GlobalSettingsWindow(ui_globalsettingsdlg.Ui_GlobalSettings,
# set up updatevm choice
self.update_vm_vmlist, self.update_vm_idx = utils.prepare_vm_choice(
self.update_vm_combo, self.qvm_collection, 'updatevm',
None, allow_none=True
None, allow_none=True,
filter_function=(lambda vm: vm.klass != 'TemplateVM')
)
# set up clockvm choice
self.clock_vm_vmlist, self.clock_vm_idx = utils.prepare_vm_choice(
self.clock_vm_combo, self.qvm_collection, 'clockvm',
None, allow_none=True
None, allow_none=True,
filter_function=(lambda vm: vm.klass != 'TemplateVM')
)
# set up default netvm