Download as
Browse Code »

Commit 352083410d8779cd71487b99604e46c96a451808

Authored by Sergio Oliveira
1 parent da6226fd
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Importing user model properly

Showing 1 changed file with 5 additions and 1 deletions   Show diff stats
src/api/resources.py
  Diff comments   View file @3520834
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 2
  3 +from django.contrib.auth import get_user_model
  4 +
3 from tastypie import fields 5 from tastypie import fields
4 from tastypie.constants import ALL_WITH_RELATIONS, ALL 6 from tastypie.constants import ALL_WITH_RELATIONS, ALL
5 from tastypie.resources import ModelResource 7 from tastypie.resources import ModelResource
6 8
7 -from accounts.models import User  
8 from super_archives.models import Message, EmailAddress 9 from super_archives.models import Message, EmailAddress
9 from proxy.models import Revision, Ticket, Wiki 10 from proxy.models import Revision, Ticket, Wiki
10 11
11 12
  13 +User = get_user_model()
  14 +
  15 +
12 class UserResource(ModelResource): 16 class UserResource(ModelResource):
13 class Meta: 17 class Meta:
14 queryset = User.objects.filter(is_active=True) 18 queryset = User.objects.filter(is_active=True)