Skip to content
This repository has been archived by the owner on Jan 31, 2019. It is now read-only.

Lets take the data from VersionCount for select boxes #33

Merged
merged 1 commit into from Oct 26, 2011
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/feedback/models.py
Expand Up @@ -231,6 +231,7 @@ class VersionCount(ModelBase):
class Meta: class Meta:
unique_together = (('product', 'version')) unique_together = (('product', 'version'))
db_table = 'version_count' db_table = 'version_count'
ordering = ['-version_int']




def update_version_int(sender, instance, **kwargs): def update_version_int(sender, instance, **kwargs):
Expand Down
14 changes: 7 additions & 7 deletions apps/search/forms.py
Expand Up @@ -11,22 +11,22 @@
from input import (FIREFOX, MOBILE, PLATFORM_USAGE, LATEST_BETAS, from input import (FIREFOX, MOBILE, PLATFORM_USAGE, LATEST_BETAS,
KNOWN_DEVICES, KNOWN_MANUFACTURERS) KNOWN_DEVICES, KNOWN_MANUFACTURERS)
from input.fields import DateInput, SearchInput from input.fields import DateInput, SearchInput

from feedback.models import VersionCount


PROD_CHOICES = ( PROD_CHOICES = (
(FIREFOX.short, FIREFOX.pretty), (FIREFOX.short, FIREFOX.pretty),
(MOBILE.short, MOBILE.pretty), (MOBILE.short, MOBILE.pretty),
) )


VERSIONS = VersionCount.objects.filter(active=1)

VERSION_CHOICES = { VERSION_CHOICES = {
FIREFOX: ([('--', _lazy(u'-- all --', 'version_choice'))] + FIREFOX: ([('--', _lazy(u'-- all --', 'version_choice'))] +
[(v, v) for v in (FIREFOX.extra_versions + [(v.version, v.version) for v in VERSIONS
FIREFOX.release_versions + if v.product == FIREFOX.id]),
FIREFOX.beta_versions)]),
MOBILE: ([('--', _lazy(u'-- all --', 'version_choice'))] + MOBILE: ([('--', _lazy(u'-- all --', 'version_choice'))] +
[(v, v) for v in (MOBILE.extra_versions + [(v.version, v.version) for v in VERSIONS
MOBILE.release_versions + if v.product == MOBILE.id]),
MOBILE.beta_versions)]),
} }


SENTIMENT_CHOICES = [('', _lazy('-- all --', 'sentiment_choice')), SENTIMENT_CHOICES = [('', _lazy('-- all --', 'sentiment_choice')),
Expand Down
16 changes: 14 additions & 2 deletions apps/search/views.py
Expand Up @@ -13,12 +13,13 @@
from product_details.version_compare import Version from product_details.version_compare import Version
from tower import ugettext as _, ugettext_lazy as _lazy from tower import ugettext as _, ugettext_lazy as _lazy


from input import (PRODUCTS, PRODUCT_IDS, FIREFOX, LATEST_BETAS, from input import (PRODUCTS, PRODUCT_IDS, FIREFOX, MOBILE, LATEST_BETAS,
OPINION_PRAISE, OPINION_ISSUE, OPINION_IDEA, OPINION_TYPES) OPINION_PRAISE, OPINION_ISSUE, OPINION_IDEA, OPINION_TYPES)
from input.decorators import cache_page, forward_mobile from input.decorators import cache_page, forward_mobile
from input.urlresolvers import reverse from input.urlresolvers import reverse
from feedback.models import VersionCount
from search.client import Client, SearchError from search.client import Client, SearchError
from search.forms import ReporterSearchForm, PROD_CHOICES, VERSION_CHOICES from search.forms import ReporterSearchForm, PROD_CHOICES


log = commonware.log.getLogger('i.search') log = commonware.log.getLogger('i.search')


Expand Down Expand Up @@ -195,6 +196,17 @@ def index(request):
of the page is "Search Results". of the page is "Search Results".
""" """


VERSIONS = VersionCount.objects.filter(active=1)

VERSION_CHOICES = {
FIREFOX: ([('--', _lazy(u'-- all --', 'version_choice'))] +
[(v.version, v.version) for v in VERSIONS
if v.product == FIREFOX.id]),
MOBILE: ([('--', _lazy(u'-- all --', 'version_choice'))] +
[(v.version, v.version) for v in VERSIONS
if v.product == MOBILE.id]),
}

try: try:
meta = ('type', 'locale', 'platform', 'day_sentiment', 'manufacturer', meta = ('type', 'locale', 'platform', 'day_sentiment', 'manufacturer',
'device') 'device')
Expand Down