shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-01-11 05:17:59 +03:00
Code Issues Projects Releases Wiki Activity

createpool: Fix adding iscsi pools (bz 1231558)

Browse Source
This commit is contained in:
Cole Robinson 2015-06-21 15:47:31 -04:00
parent fc93e154dc
commit 34db1af7b6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virtManager/createpool.py
View File

@ -479,9 +479,11 @@ class vmmCreatePool(vmmGObjectUI):
source_list = self.widget("pool-source-path")
target_list = self.widget("pool-target-path")
pool = uiutil.get_list_selection(source_list, column=2)
pool = uiutil.get_list_selection(source_list, column=2,
check_entry=False)
if pool is None:
pool = uiutil.get_list_selection(target_list, column=2)
pool = uiutil.get_list_selection(target_list, column=2,
check_entry=False)
return pool

8
virtManager/uiutil.py
View File

@ -70,17 +70,21 @@ def get_list_selected_row(widget, check_visible=False):
return row
def get_list_selection(widget, column=0, check_visible=False):
def get_list_selection(widget, column=0,
check_visible=False, check_entry=True):
"""
Helper to simplify getting the selected row and value in a list/tree/combo.
If nothing is selected, and the widget is a combo box with a text entry,
return the value of that.
:param check_entry: If True, attempt to check the widget's text entry
using the logic described above.
"""
row = get_list_selected_row(widget, check_visible=check_visible)
if row is not None:
return row[column]
if hasattr(widget, "get_has_entry"):
if check_entry and hasattr(widget, "get_has_entry"):
if widget.get_has_entry():
return widget.get_child().get_text().strip()