From d4f45fac07d1deb37451b70193f6b0f72f2dbca1 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Sat, 25 May 2013 11:27:07 +0200 Subject: [PATCH] Fixed all links that sentry marked as errors: + Some versions don't getting reverse URLs + Pages wasn't linking property + Using reverse for all URLs + Version details can show info from more than one release --- minecraftcodex/database/templates/home.html | 2 +- minecraftcodex/database/templates/layout.html | 9 +++--- .../database/templates/version.html | 28 +++++++++++-------- .../database/templates/versions.html | 2 +- minecraftcodex/database/views.py | 12 ++++++-- minecraftcodex/herobrine/urls.py | 21 ++++++++++---- 6 files changed, 48 insertions(+), 26 deletions(-) diff --git a/minecraftcodex/database/templates/home.html b/minecraftcodex/database/templates/home.html index ffcb355..58c8e3c 100644 --- a/minecraftcodex/database/templates/home.html +++ b/minecraftcodex/database/templates/home.html @@ -8,7 +8,7 @@ It's public in this state so the people can see its progress over time, and send feedback/suggestions to the staff.

-

For more details about the project, go to the about section.

+

For more details about the project, go to the about section.

Happy minning!

{% endblock %} diff --git a/minecraftcodex/database/templates/layout.html b/minecraftcodex/database/templates/layout.html index 2cf91a7..32f4486 100644 --- a/minecraftcodex/database/templates/layout.html +++ b/minecraftcodex/database/templates/layout.html @@ -13,7 +13,8 @@
- + @@ -25,15 +26,15 @@
diff --git a/minecraftcodex/database/templates/version.html b/minecraftcodex/database/templates/version.html index 52f1a97..1f3587f 100644 --- a/minecraftcodex/database/templates/version.html +++ b/minecraftcodex/database/templates/version.html @@ -1,21 +1,27 @@ {% extends "layout.html" %} {% block head_title %} -{{ super() }} | Version | {{ item.version_number }} +{{ super() }} | Version | {{ version_number }} {% endblock %} {% block content %}

Minecraft versions

- Go back -

{% if item.status != 'release' %}{{ item.status }}{% endif %} {{ item.version_number }}

- Released on {{ item.date }} - {% if item.jarfiles %} -

Downloads

- {% for jarfile in item.jarfiles %} - {{ jarfile.description|capitalize }}  - {% endfor %} + Go back +

{% if status != 'release' %}{{ status }}{% endif %} {{ version_number }}

+ {% if results > 1 %} +
This version contains more than one release.
{% endif %} -

Changelog

-

{{ item.changelog|nl2br }}

+ {% for version in items %} +
+ Released on {{ version.date }} + {% if version.jarfiles %} +

Downloads

+ {% for jarfile in version.jarfiles %} + {{ jarfile.description|capitalize }}  + {% endfor %} + {% endif %} +

Changelog

+

{{ version.changelog|nl2br }}

+ {% endfor %} {% endblock %} diff --git a/minecraftcodex/database/templates/versions.html b/minecraftcodex/database/templates/versions.html index babd3ce..c938e9d 100644 --- a/minecraftcodex/database/templates/versions.html +++ b/minecraftcodex/database/templates/versions.html @@ -53,7 +53,7 @@
    {% for p in range(1, paginator.num_pages) %}
  • - {{ p }} + {{ p }}
    • {% endfor %}
diff --git a/minecraftcodex/database/views.py b/minecraftcodex/database/views.py index c1336f1..e5b2dfa 100644 --- a/minecraftcodex/database/views.py +++ b/minecraftcodex/database/views.py @@ -11,7 +11,8 @@ def home(request): def versions(request): section = 'versions' - versions = Version.objects.filter(snapshot=False).order_by('-date', '-version_number') + versions = Version.objects.filter(snapshot=False).\ + order_by('-date', '-version_number') paginator = Paginator(versions, 50) page_number = 1 @@ -30,12 +31,17 @@ def versions(request): return render_to_response('versions.html', context_instance=context) + def version(request, version, status='release'): section = 'versions' - item = Version.objects.get(status=status, version_number=version) + items = Version.objects.filter(status=status, version_number=version).\ + order_by('-date') data = { + 'version_number': version, + 'status': status, 'section': section, - 'item': item, + 'items': items, + 'results': len(items) } context = RequestContext(request, data) return render_to_response('version.html', context_instance=context) diff --git a/minecraftcodex/herobrine/urls.py b/minecraftcodex/herobrine/urls.py index 8a2f92c..4738cf3 100644 --- a/minecraftcodex/herobrine/urls.py +++ b/minecraftcodex/herobrine/urls.py @@ -16,15 +16,24 @@ urlpatterns = patterns('', # Uncomment the next line to enable the admin: (r'^grappelli/', include('grappelli.urls')), url(r'^management/', include(admin.site.urls)), - url(r'^$', 'database.views.home'), + # Home + url(r'^$', 'database.views.home', name='homepage'), # Static - url(r'^about/', 'database.views.about'), - # Database - url(r'^versions/(?P[a-z0-9\.\_]+)/', 'database.views.version', name='version_release'), - url(r'^versions/(?P[a-z]+)\-(?P[a-z0-9\.\_]+)/', 'database.views.version', name='version'), - url(r'^versions/', 'database.views.versions'), + url(r'^about/', 'database.views.about', name='aboutpage'), + # Versions + url(r'^versions/(?P[A-Za-z0-9\.\_ ]+)/', + 'database.views.version', + name='version_release' + ), + url(r'^versions/(?P[a-z]+)\-(?P[A-Za-z0-9\.\_ ]+)/', + 'database.views.version', + name='version' + ), + url(r'^versions/', 'database.views.versions', name='version_list'), + # Robots (r'^robots\.txt$', lambda r: HttpResponse("", mimetype="text/plain")), + # Favicon (r'^favicon\.ico$', lambda r: HttpResponseRedirect('/static/favicon.ico')), )