From 45b536ff9902bcb1a71bfb55f09732f85aaee69c Mon Sep 17 00:00:00 2001 From: Lukasz Karykowski Date: Fri, 31 Jan 2020 12:19:50 +0100 Subject: [PATCH 1/3] Added new transition to Access Cards and new filter to search. --- src/ralph/access_cards/admin.py | 2 +- src/ralph/access_cards/models.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ralph/access_cards/admin.py b/src/ralph/access_cards/admin.py index 674d9e0e0b..39c036414c 100644 --- a/src/ralph/access_cards/admin.py +++ b/src/ralph/access_cards/admin.py @@ -15,7 +15,7 @@ class AccessCardAdmin(TransitionAdminMixin, RalphAdmin): list_filter = ['status', 'issue_date', 'visual_number', 'system_number', 'user', 'owner', 'user__segment', 'user__company', 'user__department', 'user__employee_id', - 'access_zones'] + 'access_zones', 'notes'] search_fields = ['visual_number', 'system_number', 'user__first_name', 'user__last_name', 'user__username'] diff --git a/src/ralph/access_cards/models.py b/src/ralph/access_cards/models.py index 77afa8a6de..42e064c7b2 100644 --- a/src/ralph/access_cards/models.py +++ b/src/ralph/access_cards/models.py @@ -170,3 +170,8 @@ def unassign_owner(cls, instances, **kwargs): 'affected_owner' ] = str(instance.owner) instance.owner = None + @classmethod + @transition_action() + def clear_access_zones(cls, instances, requester, **kwargs): + for instance in instances: + instance.access_zones.clear() From 6bbb9a947bdbe024fcb90dd0c6d3e91f3e23c2fd Mon Sep 17 00:00:00 2001 From: Lukasz Karykowski Date: Fri, 31 Jan 2020 12:28:24 +0100 Subject: [PATCH 2/3] Added new transition to Access Cards and new filter to search. --- src/ralph/access_cards/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ralph/access_cards/models.py b/src/ralph/access_cards/models.py index 42e064c7b2..6fff64af34 100644 --- a/src/ralph/access_cards/models.py +++ b/src/ralph/access_cards/models.py @@ -170,6 +170,7 @@ def unassign_owner(cls, instances, **kwargs): 'affected_owner' ] = str(instance.owner) instance.owner = None + @classmethod @transition_action() def clear_access_zones(cls, instances, requester, **kwargs): From c82e0639b218010876ad6ed33f4c0f2f8fc76f16 Mon Sep 17 00:00:00 2001 From: Lukasz Karykowski Date: Tue, 25 Feb 2020 13:15:02 +0100 Subject: [PATCH 3/3] Added new options to transitions (Clear Notes) And repair search in sim_cards --- src/ralph/access_cards/models.py | 6 ++++++ src/ralph/sim_cards/admin.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ralph/access_cards/models.py b/src/ralph/access_cards/models.py index 6fff64af34..0ec94659bb 100644 --- a/src/ralph/access_cards/models.py +++ b/src/ralph/access_cards/models.py @@ -176,3 +176,9 @@ def unassign_owner(cls, instances, **kwargs): def clear_access_zones(cls, instances, requester, **kwargs): for instance in instances: instance.access_zones.clear() + + @classmethod + @transition_action() + def clear_notes(cls, instances, requester, **kwargs): + for instance in instances: + instance.notes = None diff --git a/src/ralph/sim_cards/admin.py b/src/ralph/sim_cards/admin.py index 444b3a643e..81d51e4cc8 100644 --- a/src/ralph/sim_cards/admin.py +++ b/src/ralph/sim_cards/admin.py @@ -25,6 +25,8 @@ class SIMCardAdmin(MulitiAddAdminMixin, TransitionAdminMixin, RalphAdmin): list_select_related = [ 'user', 'warehouse', 'owner', 'carrier' ] + search_fields = ['card_number', 'phone_number', 'user__first_name', + 'user__last_name', 'user__username'] list_filter = [ 'status', 'features', 'phone_number', 'card_number', 'warehouse', @@ -46,7 +48,6 @@ class SIMCardAdmin(MulitiAddAdminMixin, TransitionAdminMixin, RalphAdmin): ) }), ) - search_fields = ('card_number', 'phone_number', 'pin1', 'puk1', 'carrier') def get_multiadd_fields(self, obj=None): multi_add_fields = [