Remove cached_entities(). Fixes #307

docs/source/modules/tcms.core.helpers.rst

@@ -11,6 +11,5 @@ Submodules
 
 .. toctree::
 
-   tcms.core.helpers.cache
    tcms.core.helpers.comments
 

tcms/search/__init__.py

@@ -11,14 +11,13 @@
 from django.shortcuts import render
 from django.views.decorators.http import require_GET
 
-from tcms.core.helpers.cache import cached_entities
 from tcms.core.utils.raw_sql import RawSQL
-from tcms.management.models import Priority
+from tcms.management.models import Priority, Product
 from tcms.search.forms import CaseForm, RunForm, PlanForm
 from tcms.search.order import order_targets
 from tcms.search.query import SmartDjangoQuery
 from tcms.testcases.models import TestCase
-from tcms.testplans.models import TestPlan
+from tcms.testplans.models import TestPlan, PlanType
 from tcms.testruns.models import TestRun
 
 
@@ -43,9 +42,9 @@ def advance_search(request):
 
     if errors or not data:
         product_choice = []
-        for product in cached_entities('product'):
+        for product in Product.objects.all():
             product_choice.append((product.pk, product.name))
-        plan_type_choices = cached_entities('plantype')  # pylint: disable=unused-variable
+        plan_type_choices = PlanType.objects.all()  # pylint: disable=unused-variable
         errors = _fmt_errors(errors)
         priorities = Priority.objects.filter(  # pylint: disable=unused-variable
             is_active=True).order_by('value')

tcms/search/forms.py

@@ -1,10 +1,9 @@
 # -*- coding: utf-8 -*-
 from django import forms
 
-from tcms.core.helpers.cache import cached_entities
-from tcms.management.models import Product, Build, Component, Version
+from tcms.management.models import Product, Priority, Build, Component, Version
 from tcms.testcases.forms import BugField
-from tcms.testcases.models import Category
+from tcms.testcases.models import Category, TestCaseStatus
 from tcms.testplans.models import PlanType
 
 
@@ -141,12 +140,12 @@ def clean_cs_tester(self):
 
     def populate(self, data):
         status_choices = []
-        for test_case_status in cached_entities('TestCaseStatus'):
+        for test_case_status in TestCaseStatus.objects.all():
             status_choices.append((test_case_status.pk, test_case_status.name))
         self.fields['cs_status'].choices = status_choices
 
         priority_choices = []
-        for priority in cached_entities('Priority'):
+        for priority in Priority.objects.all():
             priority_choices.append((priority.pk, priority.value))
         self.fields['cs_priority'].choices = priority_choices