Skip to content

Drop field mapping for Filter #1363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pnovotny merged 1 commit into from
Oct 16, 2025
Merged

Drop field mapping for Filter #1363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions nailgun/entities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3564,13 +3564,9 @@ class Filter(

def __init__(self, server_config=None, **kwargs):
self._fields = {
'location': entity_fields.OneToManyField(Location),
'organization': entity_fields.OneToManyField(Organization),
'permission': entity_fields.OneToManyField(Permission),
'role': entity_fields.OneToOneField(Role, required=True),
'search': entity_fields.StringField(),
'override': entity_fields.BooleanField(),
'unlimited': entity_fields.BooleanField(),
}
self._meta = {'api_path': 'api/v2/filters'}
super().__init__(server_config=server_config, **kwargs)
Expand All @@ -3584,14 +3580,6 @@ def create_payload(self):
"""
return {'filter': super().create_payload()}

def read(self, entity=None, attrs=None, ignore=None, params=None):
"""Deal with different named data returned from the server."""
if attrs is None:
attrs = self.read_json()
attrs['override'] = attrs.pop('override?')
attrs['unlimited'] = attrs.pop('unlimited?')
return super().read(entity, attrs, ignore, params)

def update_payload(self, fields=None):
"""Wrap submitted data within an extra dict."""
return {'filter': super().update_payload(fields)}
Expand Down
6 changes: 0 additions & 6 deletions tests/test_entities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1213,7 +1213,6 @@ def test_attrs_arg_v1(self):
# entities.UserGroup, # see test_attrs_arg_v2
entities.ContentView,
entities.Domain,
entities.Filter,
entities.Host,
entities.Media,
entities.RHCIDeployment,
Expand Down Expand Up @@ -1266,11 +1265,6 @@ def test_entity_ids(self):
{'parameters': None, 'puppet_proxy': None},
{'host_parameters_attributes': None, 'puppet_proxy': None},
),
(
entities.Filter(self.cfg),
{'override?': None, 'unlimited?': None},
{'override': None, 'unlimited': None},
),
)
for entity, attrs_before, attrs_after in test_data:
with self.subTest(entity):
Expand Down