0.2.3 #99

Merged
sonny merged 112 commits from development into master 2020-05-23 16:58:42 +02:00
2 changed files with 33 additions and 1 deletions
Showing only changes of commit 3c613b59e2 - Show all commits

View file

@ -1 +1,30 @@
# Register your models here. from django.contrib import admin
from django.utils.translation import ugettext as _
from newsreader.accounts.models import User
class UserAdmin(admin.ModelAdmin):
list_display = ("email", "last_name", "date_joined", "is_active")
list_filter = ("is_active", "is_staff", "is_superuser")
ordering = ("email",)
search_fields = ["email", "last_name", "first_name"]
readonly_fields = ("last_login", "date_joined")
fieldsets = (
(
_("User settings"),
{"fields": ("email", "first_name", "last_name", "is_active")},
),
(
_("Permission settings"),
{
"classes": ("collapse",),
"fields": ("is_staff", "is_superuser", "groups", "user_permissions"),
},
),
(_("Misc settings"), {"fields": ("date_joined", "last_login")}),
)
admin.site.register(User, UserAdmin)

View file

@ -18,6 +18,9 @@
<li class="nav__item"><a href="{% url 'news:core:categories' %}">Categories</a></li> <li class="nav__item"><a href="{% url 'news:core:categories' %}">Categories</a></li>
<li class="nav__item"><a href="{% url 'news:collection:rules' %}">Feeds</a></li> <li class="nav__item"><a href="{% url 'news:collection:rules' %}">Feeds</a></li>
<li class="nav__item"><a href="#">Settings</a></li> <li class="nav__item"><a href="#">Settings</a></li>
{% if request.user.is_superuser %}
<li class="nav__item"><a href="{% url 'admin:index' %}">Admin</a></li>
{% endif %}
<li class="nav__item"><a href="{% url 'accounts:logout' %}">Logout</a></li> <li class="nav__item"><a href="{% url 'accounts:logout' %}">Logout</a></li>
{% else %} {% else %}
<li class="nav__item"><a href="{% url 'accounts:login' %}">Login</a></li> <li class="nav__item"><a href="{% url 'accounts:login' %}">Login</a></li>