summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCole Robinson <crobinso@redhat.com>2015-06-21 15:47:31 -0400
committerCole Robinson <crobinso@redhat.com>2015-06-21 15:47:31 -0400
commit34db1af7b661b7eb5df4c71fc910d31c1ae9f7a4 (patch)
tree8c47429fec360998048775f8c53bf4ad64bf9ff3
parentfc93e154dc522a997689fbb370eac2d87f80b146 (diff)
downloadvirt-manager-34db1af7b661b7eb5df4c71fc910d31c1ae9f7a4.tar.gz
createpool: Fix adding iscsi pools (bz 1231558)
-rw-r--r--virtManager/createpool.py6
-rw-r--r--virtManager/uiutil.py8
2 files changed, 10 insertions, 4 deletions
diff --git a/virtManager/createpool.py b/virtManager/createpool.py
index bd18d436..1eaa8059 100644
--- a/virtManager/createpool.py
+++ b/virtManager/createpool.py
@@ -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
diff --git a/virtManager/uiutil.py b/virtManager/uiutil.py
index 82d2c1da..40b74d47 100644
--- a/virtManager/uiutil.py
+++ b/virtManager/uiutil.py
@@ -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()