openstack/horizon
Code Issues Proposed changes

Fix BaseRegion and TabbedFormRegion initialization

Browse Source 
Now `src_elem` and `_default_src_locator` properties work in
conjunction - if both are specified, `_default_src_locator` is being
searched in the provided `src_elem`. This fixes the issue of binding
table tabs instead of form tabs on the same page.

Co-Authored-By: Georgy Dyuldin <gdyuldin@mirantis.com>
Change-Id: Id91d82062d4145f37c7b1a33fca56bf7e441aa6e
Closes-Bug: #1549632
This commit is contained in:
Timur Sufiev 2016-03-01 17:32:36 +03:00
parent bf66705b1e
commit 592da26870
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/test/integration_tests/regions/baseregion.py
View File

@ -30,11 +30,9 @@ class BaseRegion(basewebobject.BaseWebObject):
# private methods # private methods
def __init__(self, driver, conf, src_elem=None): def __init__(self, driver, conf, src_elem=None):
super(BaseRegion, self).__init__(driver, conf) super(BaseRegion, self).__init__(driver, conf)
if src_elem is None and self._default_src_locator: if self._default_src_locator:
# fake self.src_elem must be set up in root = src_elem or driver
# order self._get_element work src_elem = root.find_element(*self._default_src_locator)
self.src_elem = driver
src_elem = self._get_element(*self._default_src_locator)
self.src_elem = src_elem or driver self.src_elem = src_elem or driver

3
openstack_dashboard/test/integration_tests/regions/forms.py
View File

@ -388,7 +388,8 @@ class TabbedFormRegion(FormRegion):
@property @property
def tabs(self): def tabs(self):
return menus.TabbedMenuRegion(self.driver, self.conf) return menus.TabbedMenuRegion(self.driver, self.conf,
src_elem=self.src_elem)
class DateFormRegion(BaseFormRegion): class DateFormRegion(BaseFormRegion):