From 2261cf40bc5e4a43cc8c1618eb54267da8805f89 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Thu, 12 May 2011 10:33:46 -0500 Subject: Put most recent ISOs first in lists Signed-off-by: Dan McGee --- releng/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/releng/views.py b/releng/views.py index a810bbbc..3180a9ed 100644 --- a/releng/views.py +++ b/releng/views.py @@ -14,7 +14,8 @@ def standard_field(model, empty_label=None, help_text=None, required=True): help_text=help_text, required=required) class TestForm(forms.ModelForm): - iso = forms.ModelChoiceField(queryset=Iso.objects.filter(active=True)) + iso = forms.ModelChoiceField(queryset=Iso.objects.filter( + active=True).order_by('-id')) architecture = standard_field(Architecture) iso_type = standard_field(IsoType) boot_type = standard_field(BootType) @@ -121,7 +122,7 @@ def test_results_for(request, option, value): raise Http404 option_model = getattr(Test, option).field.rel.to real_value = get_object_or_404(option_model, pk=value) - test_list = real_value.test_set.order_by("iso__name", "pk") + test_list = real_value.test_set.order_by('-iso__name', '-pk') context = { 'option': option, 'value': real_value, -- cgit v1.2.3-2-g168b From d20b20bd8ac66ff8c05e4a6b40a72fc25419075a Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Sun, 15 May 2011 15:00:49 +0200 Subject: releng: Place helptext closer to its option list Place all the elements with the helptext class that follow a
    closer to the
      . Signed-off-by: Tom Willemsen Signed-off-by: Dan McGee --- media/archweb.css | 1 + 1 file changed, 1 insertion(+) diff --git a/media/archweb.css b/media/archweb.css index 504c8270..9832d586 100644 --- a/media/archweb.css +++ b/media/archweb.css @@ -264,6 +264,7 @@ ul.admin-actions li { display: inline; padding-left: 1.5em; } #releng-feedback label { width: auto; display: inline; font-weight: normal; } #releng-feedback ul { padding-left: 1em; } #releng-feedback li { list-style: none; } +#releng-feedback ul+.helptext { position: relative; top: -0.9em; } /* highlight current website in the navbar */ #archnavbar.anb-home ul li#anb-home a { color: white !important; } -- cgit v1.2.3-2-g168b From f04de80528da8e4eeba8fbbf9f720ba046a5bf11 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 15 May 2011 11:25:17 -0500 Subject: Allow screening developer reports by maintainer A simple link is added for each user, but the URLs are flexible enough to screen by any maintainer if you know how they are constructed. Signed-off-by: Dan McGee --- devel/urls.py | 1 + devel/views.py | 22 ++++++++++++++++++---- templates/devel/index.html | 22 +++++++++++++++------- templates/devel/packages.html | 8 ++++++-- 4 files changed, 40 insertions(+), 13 deletions(-) diff --git a/devel/urls.py b/devel/urls.py index 9bf50f45..8759562e 100644 --- a/devel/urls.py +++ b/devel/urls.py @@ -7,6 +7,7 @@ urlpatterns = patterns('devel.views', (r'^$', 'index'), (r'^newuser/$', 'new_user_form'), (r'^profile/$', 'change_profile'), + (r'^reports/(?P.*)/(?P.*)/$', 'report'), (r'^reports/(?P.*)/$', 'report'), ) diff --git a/devel/views.py b/devel/views.py index 555c7cc5..6c36742f 100644 --- a/devel/views.py +++ b/devel/views.py @@ -128,18 +128,21 @@ def change_profile(request): {'form': form, 'profile_form': profile_form}) @login_required -def report(request, report): +def report(request, report, username=None): title = 'Developer Report' packages = Package.objects.select_related('arch', 'repo') - names = attrs = None + names = attrs = user = None + if report == 'old': title = 'Packages last built more than two years ago' cutoff = datetime.now() - timedelta(days=730) - packages = packages.filter(build_date__lt=cutoff).order_by('build_date') + packages = packages.filter( + build_date__lt=cutoff).order_by('build_date') elif report == 'big': title = 'Packages with compressed size > 50 MiB' cutoff = 50 * 1024 * 1024 - packages = packages.filter(compressed_size__gte=cutoff).order_by('-compressed_size') + packages = packages.filter( + compressed_size__gte=cutoff).order_by('-compressed_size') names = [ 'Compressed Size', 'Installed Size' ] attrs = [ 'compressed_size_pretty', 'installed_size_pretty' ] # Format the compressed and installed sizes with MB/GB/etc suffixes @@ -175,8 +178,19 @@ def report(request, report): else: raise Http404 + if username: + user = get_object_or_404(User, username=username, is_active=True) + maintained = PackageRelation.objects.filter(user=user, + type=PackageRelation.MAINTAINER).values('pkgbase') + packages = packages.filter(pkgbase__in=maintained) + + maints = User.objects.filter(id__in=PackageRelation.objects.filter( + type=PackageRelation.MAINTAINER).values('user')) + context = { + 'all_maintainers': maints, 'title': title, + 'maintainer': user, 'packages': packages, 'column_names': names, 'column_attrs': attrs, diff --git a/templates/devel/index.html b/templates/devel/index.html index 29b98bdf..015ae1b2 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -100,13 +100,21 @@

      Developer Reports

      diff --git a/templates/devel/packages.html b/templates/devel/packages.html index e0988c03..051ee4a3 100644 --- a/templates/devel/packages.html +++ b/templates/devel/packages.html @@ -5,8 +5,12 @@ {% block content %}
      -

      {{ title }}

      -

      {{ packages|length }} package{{ packages|pluralize }} found.

      +

      {{ title }}{% if maintainer %}, + maintained by {{ maintainer.get_full_name }}{% endif%}

      +

      {{ packages|length }} package{{ packages|pluralize }} found. + {% if maintainer %}This report only includes packages maintained by + {{ maintainer.get_full_name }} ({{ maintainer.username }}).{% endif %} +

      -- cgit v1.2.3-2-g168b From 070956ee6ef6c6b01c89c214b4f411043951f5ce Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 15 May 2011 11:33:37 -0500 Subject: Remove stale JS remnant Signed-off-by: Dan McGee --- media/django-jsi18n.js | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 media/django-jsi18n.js diff --git a/media/django-jsi18n.js b/media/django-jsi18n.js deleted file mode 100644 index 83562c1a..00000000 --- a/media/django-jsi18n.js +++ /dev/null @@ -1,35 +0,0 @@ - -/* gettext library */ - -var catalog = new Array(); - -function pluralidx(count) { return (count == 1) ? 0 : 1; } - - -function gettext(msgid) { - var value = catalog[msgid]; - if (typeof(value) == 'undefined') { - return msgid; - } else { - return (typeof(value) == 'string') ? value : value[0]; - } -} - -function ngettext(singular, plural, count) { - value = catalog[singular]; - if (typeof(value) == 'undefined') { - return (count == 1) ? singular : plural; - } else { - return value[pluralidx(count)]; - } -} - -function gettext_noop(msgid) { return msgid; } - -function interpolate(fmt, obj, named) { - if (named) { - return fmt.replace(/%\(\w+\)s/g, function(match){return String(obj[match.slice(2,-2)])}); - } else { - return fmt.replace(/%s/g, function(match){return String(obj.shift())}); - } -} -- cgit v1.2.3-2-g168b From ef7cccf85df1c8908661f3a9525051b7e9d8d3a1 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Sun, 15 May 2011 19:14:48 +0200 Subject: releng: Add more (and more precise) clock choices Signed-off-by: Tom Willemsen Signed-off-by: Dan McGee --- releng/fixtures/clockchoices.json | 55 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/releng/fixtures/clockchoices.json b/releng/fixtures/clockchoices.json index f328801a..700adeba 100644 --- a/releng/fixtures/clockchoices.json +++ b/releng/fixtures/clockchoices.json @@ -3,21 +3,70 @@ "pk": 1, "model": "releng.clockchoice", "fields": { - "name": "unchanged" + "name": "default region/timezone, keep clock" } }, { "pk": 2, "model": "releng.clockchoice", "fields": { - "name": "configured manually" + "name": "default region/timezone, change clock manually (UTC)" } }, { "pk": 3, "model": "releng.clockchoice", "fields": { - "name": "NTP" + "name": "default region/timezone, change clock with NTP (UTC)" + } + }, + { + "pk": 4, + "model": "releng.clockchoice", + "fields": { + "name": "default region/timezone, change clock manually (localtime)" + } + }, + { + "pk": 5, + "model": "releng.clockchoice", + "fields": { + "name": "default region/timezone, change clock with NTP (localtime)" + } + },2 + { + "pk": 6, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, keep clock" + } + }, + { + "pk": 7, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, change clock manually (UTC)" + } + }, + { + "pk": 8, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, change clock with NTP (UTC)" + } + }, + { + "pk": 9, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, change clock manually (localtime)" + } + }, + { + "pk": 10, + "model": "releng.clockchoice", + "fields": { + "name": "update region/timezone, change clock with NTP (localtime)" } } ] -- cgit v1.2.3-2-g168b From 7c663a77b187e4592ce112da4bd1588a4ac066bc Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 15 May 2011 12:20:04 -0500 Subject: Fix typo introduced in fixture creation Signed-off-by: Dan McGee --- releng/fixtures/clockchoices.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releng/fixtures/clockchoices.json b/releng/fixtures/clockchoices.json index 700adeba..d2d4eb80 100644 --- a/releng/fixtures/clockchoices.json +++ b/releng/fixtures/clockchoices.json @@ -33,7 +33,7 @@ "fields": { "name": "default region/timezone, change clock with NTP (localtime)" } - },2 + }, { "pk": 6, "model": "releng.clockchoice", -- cgit v1.2.3-2-g168b