From 1dc867587da6b66ca575eb26f4f65cb9d67ffdb3 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 4 Jan 2011 08:45:15 -0600 Subject: Add Admin log overview page This puts the admin log functionality to a bit more use and allows seeing the last 100 overall entries. You can also drill down to see actions on a per-user basis. Signed-off-by: Dan McGee --- templates/devel/admin_log.html | 62 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 templates/devel/admin_log.html (limited to 'templates/devel') diff --git a/templates/devel/admin_log.html b/templates/devel/admin_log.html new file mode 100644 index 00000000..2de15bad --- /dev/null +++ b/templates/devel/admin_log.html @@ -0,0 +1,62 @@ +{% extends "admin/base_site.html" %} +{% load i18n %} + +{% block extrastyle %}{{ block.super }}{% endblock %} + +{% block breadcrumbs %}
{% trans 'Home' %}{% if title %} › {{ title }}{% endif %}
{% endblock %} + +{% block content %} +
+
+{% load log %} +{% if log_user %} +{% get_admin_log 100 as admin_log for_user log_user %} +{% else %} +{% get_admin_log 100 as admin_log %} +{% endif %} +{% if not admin_log %} +

{% trans 'None available' %}

+{% else %} + + + + + + + + + + + + {% for entry in admin_log %} + + + {% if log_user %} + + {% else %} + + {% endif %} + + + + + {% endfor %} + +
{% trans 'Date/time' %}{% trans 'User' %}TypeObject{% trans 'Action' %}
{{ entry.action_time|date:"DATETIME_FORMAT" }}{{ entry.user.username }}{% if entry.user.get_full_name %} ({{ entry.user.get_full_name }}){% endif %}{{ entry.user.username }}{% if entry.user.get_full_name %} ({{ entry.user.get_full_name }}){% endif %} + {% if entry.content_type %} + {% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %} + {% else %} + {% trans 'Unknown content' %} + {% endif %} + + + {% if entry.is_deletion %} + {{ entry.object_repr }} + {% else %} + {{ entry.object_repr }} + {% endif %} + {{ entry.change_message }}
+{% endif %} +
+
+{% endblock %} -- cgit v1.2.3-54-g00ecf From 16890b7d8822ae7f82852f01274b11df6aa2ef6a Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 10 Mar 2011 10:53:51 -0600 Subject: Fix relative URL links in admin_log template Signed-off-by: Dan McGee --- templates/devel/admin_log.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/devel') diff --git a/templates/devel/admin_log.html b/templates/devel/admin_log.html index 2de15bad..0f22ba2b 100644 --- a/templates/devel/admin_log.html +++ b/templates/devel/admin_log.html @@ -48,7 +48,7 @@ {% if entry.is_deletion %} {{ entry.object_repr }} {% else %} - {{ entry.object_repr }} + {{ entry.object_repr }} {% endif %} {{ entry.change_message }} -- cgit v1.2.3-54-g00ecf From ad2a9ac23af0d4610e079741070c4408a4c6ce16 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Fri, 11 Mar 2011 17:13:25 -0600 Subject: Show orphan package counts in maintainer dashboard table Signed-off-by: Dan McGee --- devel/views.py | 11 +++++++++++ templates/devel/index.html | 9 +++++++++ 2 files changed, 20 insertions(+) (limited to 'templates/devel') diff --git a/devel/views.py b/devel/views.py index 46387f7a..5b8965d8 100644 --- a/devel/views.py +++ b/devel/views.py @@ -36,11 +36,22 @@ def index(request): maintainers = get_annotated_maintainers() + maintained = PackageRelation.objects.filter( + type=PackageRelation.MAINTAINER).values('pkgbase') + total_orphans = Package.objects.exclude(pkgbase__in=maintained).count() + total_flagged_orphans = Package.objects.filter( + flag_date__isnull=False).exclude(pkgbase__in=maintained).count() + orphan = { + 'package_count': total_orphans, + 'flagged_count': total_flagged_orphans, + } + page_dict = { 'todos': Todolist.objects.incomplete().order_by('-date_added'), 'repos': Repo.objects.all(), 'arches': Arch.objects.all(), 'maintainers': maintainers, + 'orphan': orphan, 'flagged' : flagged, 'todopkgs' : todopkgs, } diff --git a/templates/devel/index.html b/templates/devel/index.html index 08ca249a..fb4ed4ab 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -166,6 +166,15 @@

Package Todo Lists

# Packages # Flagged + + Orphan + + {{ orphan.package_count }} packages + + {{ orphan.flagged_count }} packages + {% for maint in maintainers %} -- cgit v1.2.3-54-g00ecf From 9fd7174029de87e58e25db6362f6e1c5349f0599 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 15 Mar 2011 00:00:12 -0500 Subject: Use date template filter on datetime field display Signed-off-by: Dan McGee --- templates/devel/index.html | 6 +++--- templates/todolists/list.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'templates/devel') diff --git a/templates/devel/index.html b/templates/devel/index.html index fb4ed4ab..f4a81102 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -27,8 +27,8 @@

My Flagged Packages

{{ pkg.repo.name }} {{ pkg.pkgver }} {{ pkg.arch.name }} - {{ pkg.flag_date }} - {{ pkg.last_update }} + {{ pkg.flag_date|date }} + {{ pkg.last_update|date }} {% empty %} No flagged packages to display @@ -80,7 +80,7 @@

Package Todo Lists

{{ todo.name }} - {{ todo.date_added }} + {{ todo.date_added|date }} {{ todo.description|safe }} {% empty %} diff --git a/templates/todolists/list.html b/templates/todolists/list.html index 78acabfb..7d229271 100644 --- a/templates/todolists/list.html +++ b/templates/todolists/list.html @@ -30,7 +30,7 @@

Package Todo Lists

{{ list.name }} - {{ list.date_added }} + {{ list.date_added|date }} {{ list.creator.get_full_name }} {{ list.description|urlize }} {{ list.pkg_count }} -- cgit v1.2.3-54-g00ecf