Commit 1ff80f8e authored by John Red Medrano's avatar John Red Medrano

added search on master company and department, management account,...

added search on master company and department, management account, applications, company, department, module
parent bd12f3af
......@@ -33,7 +33,12 @@ class UserViewSet(viewsets.ModelViewSet):
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
filterset_class = UserFilterSet
ordering_fields = '__all__'
search_fields = ('name',)
search_fields = (
'name', 'code',
'department__company__name',
'department__name',
'email', 'contact_no'
)
@rms.user_create
@transaction.atomic
......
......@@ -22,7 +22,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
filterset_class = ApplicationFilterSet
ordering_fields = '__all__'
search_fields = ('name',)
search_fields = ('name', 'code')
@transaction.atomic
def create(self, request, *args, **kwargs):
......
......@@ -22,7 +22,7 @@ class CompanyViewSet(viewsets.ModelViewSet):
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
filterset_class = CompanyFilterSet
ordering_fields = '__all__'
search_fields = ('name',)
search_fields = ('name', 'contact_details', 'modified')
@decorators.rms.company_crate
@transaction.atomic
......
......@@ -22,7 +22,7 @@ class DepartmentViewSet(viewsets.ModelViewSet):
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
filterset_class = DepartmentFilterSet
ordering_fields = '__all__'
search_fields = ('name',)
search_fields = ('name', 'company__name', 'code')
@decorators.rms.department_crate
@transaction.atomic
......
......@@ -24,7 +24,10 @@ class ModuleViewSet(viewsets.ModelViewSet):
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
filterset_class = ModuleFilterSet
ordering_fields = '__all__'
search_fields = ('name',)
search_fields = (
'name', 'application__name',
'code', 'component', 'sort_number'
)
@transaction.atomic
def create(self, request, *args, **kwargs):
......
......@@ -18,7 +18,7 @@ class AdminCompanyViewSet(viewsets.ModelViewSet):
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
filterset_class = CompanyFilterSet
ordering_fields = '__all__'
search_fields = ('name',)
search_fields = ('name', 'name', 'contact_details')
http_method_names = ['get']
@rms.company_list
......
......@@ -21,7 +21,7 @@ class AdminDepartmentViewSet(viewsets.ModelViewSet):
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
filterset_class = DepartmentFilterSet
ordering_fields = '__all__'
search_fields = ('name',)
search_fields = ('name', 'company__name', 'code')
@rms.department_list
def list(self, request, *args, **kwargs):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment