Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* qubesos/pr/122:
  And also fixed problem with setting default template to None
  Fixed problem with setting default_dispvm to None in Global Settings
This commit is contained in:
Marek Marczykowski-Górecki 2018-07-24 01:39:33 +02:00
commit 146ce683f7
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qubesmanager/global_settings.py
View File

@ -89,7 +89,8 @@ class GlobalSettingsWindow(ui_globalsettingsdlg.Ui_GlobalSettings,
self.default_template_combo,
self.qvm_collection, 'default_template',
None,
filter_function=(lambda vm: vm.klass == 'TemplateVM')
filter_function=(lambda vm: vm.klass == 'TemplateVM'),
allow_none=True
)
# default dispvm
@ -98,7 +99,8 @@ class GlobalSettingsWindow(ui_globalsettingsdlg.Ui_GlobalSettings,
self.default_dispvm_combo,
self.qvm_collection, 'default_dispvm',
None,
(lambda vm: getattr(vm, 'template_for_dispvms', False))
(lambda vm: getattr(vm, 'template_for_dispvms', False)),
allow_none=True
)
def __apply_system_defaults__(self):