External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 06:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

deal with a special null null case

Browse Source
This commit is contained in:
AlanCoding
2016-11-05 14:24:04 -04:00
parent 2279e1e8dc
commit f2846101a3
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/access.py
View File

@@ -207,7 +207,6 @@ class BaseAccess(object):
''' '''
new = None new = None
changed = True changed = True
is_removal = False
if data and 'reference_obj' in data: if data and 'reference_obj' in data:
# Use reference object's related fields, if given # Use reference object's related fields, if given
new = getattr(data['reference_obj'], field) new = getattr(data['reference_obj'], field)
@@ -218,7 +217,6 @@ class BaseAccess(object):
new = raw_value new = raw_value
elif raw_value is None: elif raw_value is None:
new = None new = None
is_removal = True
else: else:
try: try:
new_pk = int(raw_value) new_pk = int(raw_value)
@@ -238,7 +236,7 @@ class BaseAccess(object):
if obj and (changed or mandatory): if obj and (changed or mandatory):
current = getattr(obj, field) current = getattr(obj, field)
if obj and new == current and (not is_removal): if obj and new == current:
# Resource not changed, like a PUT request # Resource not changed, like a PUT request
changed = False changed = False

8
awx/main/tests/unit/test_access.py
View File

@@ -101,6 +101,14 @@ class TestRelatedFieldAccess:
assert not access.check_related( assert not access.check_related(
'related', mocker.MagicMock, data, obj=resource_bad) 'related', mocker.MagicMock, data, obj=resource_bad)
def test_existing_not_null_null(self, access, bad_role, mocker):
resource = mocker.MagicMock(related=None)
data = {'related': None}
# Not changing anything by giving null when it is already-null
# important for PUT requests
assert access.check_related(
'related', mocker.MagicMock, data, obj=resource, mandatory=True)
@pytest.fixture @pytest.fixture
def job_template_with_ids(job_template_factory): def job_template_with_ids(job_template_factory):
# Create non-persisted objects with IDs to send to job_template_factory # Create non-persisted objects with IDs to send to job_template_factory