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:
commit
5e4ac80ed2
@ -63,13 +63,15 @@ class GlobalSettingsWindow(ui_globalsettingsdlg.Ui_GlobalSettings,
|
|||||||
# set up updatevm choice
|
# set up updatevm choice
|
||||||
self.update_vm_vmlist, self.update_vm_idx = utils.prepare_vm_choice(
|
self.update_vm_vmlist, self.update_vm_idx = utils.prepare_vm_choice(
|
||||||
self.update_vm_combo, self.qvm_collection, 'updatevm',
|
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
|
# set up clockvm choice
|
||||||
self.clock_vm_vmlist, self.clock_vm_idx = utils.prepare_vm_choice(
|
self.clock_vm_vmlist, self.clock_vm_idx = utils.prepare_vm_choice(
|
||||||
self.clock_vm_combo, self.qvm_collection, 'clockvm',
|
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
|
# set up default netvm
|
||||||
|
Loading…
Reference in New Issue
Block a user