Download as
Browse Code »

Commit 1d609e2a1fad297bfcd4b40e876a06da67b03f21

Authored by Sergio Oliveira
1 parent 196774da
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

Removing userprofile from django admin

Showing 2 changed files with 4 additions and 5 deletions   Show diff stats
src/accounts/views.py
  Diff comments   View file @1d609e2
... ... @@ -5,7 +5,7 @@ import uuid
5 5 from colab.deprecated import signup as signup_
6 6  
7 7 from django.template import RequestContext
8   -from django.contrib.auth.models import User
  8 +from django.contrib.auth import get_user_model
9 9 from django.views.generic import DetailView
10 10 from django.utils.translation import ugettext as _
11 11 from django.shortcuts import render, get_object_or_404
... ... @@ -13,7 +13,7 @@ from django.shortcuts import render, get_object_or_404
13 13 from colab.deprecated import solrutils
14 14  
15 15 from .forms import UserCreationForm
16   -from super_archives.models import UserProfile, EmailAddress, Message
  16 +from super_archives.models import EmailAddress, Message
17 17  
18 18  
19 19 # helper
... ... @@ -116,7 +116,7 @@ def verify_email(request, hash):
116 116  
117 117  
118 118 class UserProfileDetailView(DetailView):
119   - model = User
  119 + model = get_user_model()
120 120 slug_field = 'username'
121 121 slug_url_kwarg = 'username'
122 122 context_object_name = 'user_'
... ...
src/super_archives/admin.py
  Diff comments   View file @1d609e2
1 1  
2 2 from django.contrib import admin
3   -from .models import Message, Thread, UserProfile
  3 +from .models import Message, Thread
4 4  
5 5 class MessageAdmin(admin.ModelAdmin):
6 6 list_filter = ('spam', 'thread__mailinglist', 'received_time', )
... ... @@ -48,7 +48,6 @@ class ThreadAdmin(admin.ModelAdmin):
48 48 )
49 49  
50 50  
51   -admin.site.register(UserProfile)
52 51 admin.site.register(Thread, ThreadAdmin)
53 52 admin.site.register(Message, MessageAdmin)
54 53  
... ...