Skip to content
This repository has been archived by the owner on Mar 15, 2018. It is now read-only.

Commit

Permalink
add tags to API response for apps (bug 930593)
Browse files Browse the repository at this point in the history
  • Loading branch information
Allen Short committed Oct 25, 2013
1 parent 35eee3a commit d35cf89
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
1 change: 0 additions & 1 deletion apps/users/views.py
Expand Up @@ -463,7 +463,6 @@ def _login(request, template=None, data=None, dont_redirect=False):
signature='AUTHFAIL',
msg='The username was invalid')
pass

partial_form = partial(forms.AuthenticationForm, use_recaptcha=limited)
r = auth.views.login(request, template_name=template,
redirect_field_name='to',
Expand Down
1 change: 1 addition & 0 deletions mkt/api/resources.py
Expand Up @@ -262,6 +262,7 @@ def dehydrate(self, bundle):
def dehydrate_extra(self, bundle):
if bundle.obj.upsold:
bundle.data['upsold'] = self.get_resource_uri(bundle.obj.upsold.free)
bundle.data['tags'] = [t.tag_text for t in bundle.obj.tags.all()]

def hydrate_premium_type(self, bundle):
typ = amo.ADDON_PREMIUM_API_LOOKUP.get(bundle.data['premium_type'],
Expand Down
11 changes: 11 additions & 0 deletions mkt/api/tests/test_handlers.py
Expand Up @@ -15,6 +15,7 @@
from amo.tests import AMOPaths, app_factory
from files.models import FileUpload
from market.models import Price, PriceCurrency
from tags.models import AddonTag, Tag
from users.models import UserProfile

from mkt.api.base import get_url, list_url
Expand Down Expand Up @@ -630,6 +631,16 @@ def test_get_upsold(self):
self.client.get_absolute_url(get_url('app', pk=free.pk),
absolute=False))

def test_tags(self):
app = Webapp.objects.get(pk=337141)
tag1 = Tag.objects.create(tag_text='example1')
tag2 = Tag.objects.create(tag_text='example2')
AddonTag.objects.create(tag=tag1, addon=app)
AddonTag.objects.create(tag=tag2, addon=app)
res = self.client.get(self.get_url, pk=app.pk)
data = json.loads(res.content)
eq_(data['tags'], ['example1', 'example2'])


class TestCategoryHandler(RestOAuth):

Expand Down

0 comments on commit d35cf89

Please sign in to comment.