Skip to content

Django 1.5+ compatibility #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dmpayton wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Django 1.5+ compatibility #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ef3732
Fixes for Django 1.5+
dmpayton Jun 26, 2014
491b600
Fix broken url templatetag in async_wait.html
dmpayton Sep 3, 2014
da98946
Update request_report.html
fr93274 Jan 15, 2015
b85c9c4
Update filtercontrols.py
fr93274 Jan 15, 2015
2f8ad69
Merge pull request #1 from fr93274/master
dmpayton Jun 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions reportengine/filtercontrols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ def get_fields(self):
:return: A dictionary containing hte start and end dates for the filtercontrol
"""
ln=self.label or self.field_name
start=forms.CharField(label=_("%s From")%ln,required=False,widget=forms.DateTimeInput(attrs={'class': 'vDateField'}))
end=forms.CharField(label=_("%s To")%ln,required=False,widget=forms.DateTimeInput(attrs={'class': 'vDateField'}))
start=forms.CharField(label=_("%s is After")%ln,required=False,widget=forms.DateTimeInput(attrs={'class': 'vDateField'}))
end=forms.CharField(label=_("%s is Before")%ln,required=False,widget=forms.DateTimeInput(attrs={'class': 'vDateField'}))
return SortedDict([("%s__gte"%self.field_name, start),
("%s__lt"%self.field_name, end),])

Expand Down
5 changes: 3 additions & 2 deletions reportengine/templates/reportengine/async_wait.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% extends "admin/base_site.html" %}
{% load i18n %}
{% load url from future %}

{# TODO note that meta refreshes are deprecated.. but is there a nice clean way to do this otherwise? #}
{% block extrahead %}
Expand All @@ -18,8 +19,8 @@ <h2>{% trans "Please wait while your report is generated..." %}</h2>

{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="/admin/">{% trans "Home" %}</a> &rsaquo;
<a href="{% url reports-list %}">{% trans "Reports" %}</a> &rsaquo;
<a href="{% url "admin:index" %}">{% trans "Home" %}</a> &rsaquo;
<a href="{% url "reports-list" %}">{% trans "Reports" %}</a> &rsaquo;
<a href="{{ report_request.get_report_url }}">{{report.verbose_name}}</a> &rsaquo;
{% if format %}
<a href="{{ report_request.get_absolute_url }}">{% trans "Report Result" %}</a> &rsaquo;
Expand Down
12 changes: 7 additions & 5 deletions reportengine/templates/reportengine/calendar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
{% extends "admin/base_site.html" %}
{% load adminmedia admin_list i18n %}
{% load i18n %}
{% load static %}
{% load url from future %}

{% block extrastyle %}
<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/changelists.css" />
<link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
{% endblock %}

{% block bodyclass %}change-list{% endblock %}

{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="/admin/">{% trans "Home" %}</a> &rsaquo;
<a href="{% url reports-list %}">Reports</a> &rsaquo;
<a href="{% url "admin:index" %}">{% trans "Home" %}</a> &rsaquo;
<a href="{% url "reports-list" %}">Reports</a> &rsaquo;
calendar for {% block calendar_breadcrumb %}{% endblock %}
</div>
{% endblock %}
Expand All @@ -20,7 +22,7 @@
{% block content %}
<div id="content-main">
{% block object-tools %}{% endblock %}

{% block calendarcontent %}{% endblock %}

</div>
Expand Down
3 changes: 2 additions & 1 deletion reportengine/templates/reportengine/calendar_day.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{% extends "reportengine/calendar.html" %}
{% load url from future %}

{% block calendar_breadcrumb %}{{ date|date:"d M Y" }}{% endblock %}

Expand All @@ -7,7 +8,7 @@ <h2>Reports for {{ date|date:"d M Y" }}</h2>

<ul>
{% for r in reports %}
<li><a href="{% url reports-date-range date.year date.month date.day r.namespace r.slug %}">{{ r.verbose_name }}</a></li>
<li><a href="{% url "reports-date-range" date.year date.month date.day r.namespace r.slug %}">{{ r.verbose_name }}</a></li>
{% endfor %}
</ul>

Expand Down
9 changes: 5 additions & 4 deletions reportengine/templates/reportengine/calendar_month.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
{% extends "reportengine/calendar.html" %}
{% load url from future %}

{% block calendar_breadcrumb %}{{ date|date:"M Y" }}{% endblock %}

{% block calendarcontent %}
<h2>Reports for {{ date|date:"M Y" }}</h2>

<a href="{% url reports-calendar-current %}">current month</a>
<a href="{% url "reports-calendar-current" %}">current month</a>
<!-- TODO: make this localized -->
<table>
<tr>
<td><a href="{% url reports-calendar-month prev.year prev.month %}">&laquo;</a></td>
<td><a href="{% url "reports-calendar-month" prev.year prev.month %}">&laquo;</a></td>
<td colspan="5"></td>
<td><a href="{% url reports-calendar-month next.year next.month %}">&raquo;</a></td>
<td><a href="{% url "reports-calendar-month" next.year next.month %}">&raquo;</a></td>
</tr>
<tr>
<td>M</td>
Expand All @@ -28,7 +29,7 @@ <h2>Reports for {{ date|date:"M Y" }}</h2>
<td>
{% if day %}
<div class="day">
<a href="{% url reports-calendar-day date.year date.month date.day %}">{{ day }}</a>
<a href="{% url "reports-calendar-day" date.year date.month date.day %}">{{ day }}</a>
</div>
{% endif %}
</td>
Expand Down
12 changes: 7 additions & 5 deletions reportengine/templates/reportengine/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{% extends "admin/base_site.html" %}
{% load adminmedia admin_list i18n %}
{% load i18n %}
{% load static %}
{% load url from future %}

{% block extrastyle %}
<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/changelists.css" />
<link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
{% endblock %}


Expand All @@ -11,7 +13,7 @@

{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="/admin/">{% trans "Home" %}</a> &rsaquo;
<a href="{% url "admin:index" %}">{% trans "Home" %}</a> &rsaquo;
Reports

</div>
Expand All @@ -28,15 +30,15 @@
<H2>Reports</H2>

<div>
<a href="{% url reports-calendar-current %}">Calendar View</a>
<a href="{% url "reports-calendar-current" %}">Calendar View</a>
</div>

<div id="changelist">
{% regroup reports|dictsort:"namespace" by namespace as report_list %}
{% for namespace in report_list %}
<h3>{{ namespace.grouper|title }}</h3>
{% for report in namespace.list|dictsort:"verbose_name" %}
<a href="{% url reports-view report.namespace report.slug %}">{{ report.verbose_name }}</a><br />
<a href="{% url "reports-view" report.namespace report.slug %}">{{ report.verbose_name }}</a><br />
{% endfor %}
{% endfor %}
</div>
Expand Down
23 changes: 13 additions & 10 deletions reportengine/templates/reportengine/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
{% extends "admin/base_site.html" %}
{% load adminmedia admin_list i18n %}
{% load admin_list %}
{% load i18n %}
{% load static %}
{% load url from future %}

{% block extrastyle %}
<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />
<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/changelists.css" />
<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />
<link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
{% endblock %}

{% block extrahead %}
<script type="text/javascript" src="{% url admin:jsi18n %}"></script>
<script type="text/javascript" src="{% admin_media_prefix %}js/core.js"></script>
<script type="text/javascript" src="{% admin_media_prefix %}js/calendar.js"></script>
<script type="text/javascript" src="{% admin_media_prefix %}js/admin/DateTimeShortcuts.js"></script>
<script type="text/javascript" src="{% url "admin:jsi18n" %}"></script>
<script type="text/javascript" src="{% static "admin/js/core.js" %}"></script>
<script type="text/javascript" src="{% static "admin/js/calendar.js" %}"></script>
<script type="text/javascript" src="{% static "admin/js/admin/DateTimeShortcuts.js" %}"></script>
{% endblock %}

{% block bodyclass %}change-list{% endblock %}

{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="/admin/">{% trans "Home" %}</a> &rsaquo;
<a href="{% url reports-list %}">{% trans "Reports" %}</a> &rsaquo;
<a href="{% url "admin:index" %}">{% trans "Home" %}</a> &rsaquo;
<a href="{% url "reports-list" %}">{% trans "Reports" %}</a> &rsaquo;
<a href="{{ report_request.get_report_url }}">{{report.verbose_name}}</a> &rsaquo;
{% trans "Report Result" %}
</div>
Expand Down Expand Up @@ -57,7 +60,7 @@ <h3>{% trans "Alternate Formats" %}</h3>
{% ifequal of output_format %}
{{ of.verbose_name }} {% if not forloop.last %}|{% endif %}
{% else %}
<a href="{% url reports-request-view-format report_request.token of.slug %}">{{ of.verbose_name }}</a> {% if not forloop.last %}|{% endif %}
<a href="{% url "reports-request-view-format" report_request.token of.slug %}">{{ of.verbose_name }}</a> {% if not forloop.last %}|{% endif %}
{% endifequal %}
{% endfor %}
</div>
Expand Down
24 changes: 14 additions & 10 deletions reportengine/templates/reportengine/request_report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
{% extends "admin/base_site.html" %}
{% load adminmedia admin_list i18n %}
{% load admin_list %}
{% load i18n %}
{% load static %}
{% load url from future %}

{% block extrastyle %}
<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />
<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/changelists.css" />
<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />
<link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
{% endblock %}

{% block extrahead %}
<script type="text/javascript" src="{% url admin:jsi18n %}"></script>
<script type="text/javascript" src="{% admin_media_prefix %}js/jquery.init.js"></script>
<script type="text/javascript" src="{% admin_media_prefix %}js/core.js"></script>
<script type="text/javascript" src="{% admin_media_prefix %}js/calendar.js"></script>
<script type="text/javascript" src="{% admin_media_prefix %}js/admin/DateTimeShortcuts.js"></script>
<script type="text/javascript" src="{% url "admin:jsi18n" %}"></script>
<script type="text/javascript" src="{% static "admin/js/jquery.min.js" %}"></script>
<script type="text/javascript" src="{% static "admin/js/jquery.init.js" %}"></script>
<script type="text/javascript" src="{% static "admin/js/core.js" %}"></script>
<script type="text/javascript" src="{% static "admin/js/calendar.js" %}"></script>
<script type="text/javascript" src="{% static "admin/js/admin/DateTimeShortcuts.js" %}"></script>
{% endblock %}

{% block bodyclass %}change-list{% endblock %}

{% block breadcrumbs %}
<div class="breadcrumbs">
<a href="/admin/">{% trans "Home" %}</a> &rsaquo;
<a href="{% url reports-list %}">{% trans "Reports" %}</a> &rsaquo;
<a href="{% url "reports-list" %}">{% trans "Reports" %}</a> &rsaquo;
{{report.verbose_name}}
</div>
{% endblock %}
Expand Down Expand Up @@ -47,7 +51,7 @@ <h3>{% trans "Filters" %}</h3>
</form>
</div>
{% endblock %}

{% block requested_reports %}
<h3>{% trans "Previously Requested Reports" %}</h3>
<table>
Expand Down
19 changes: 10 additions & 9 deletions reportengine/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
from django.conf.urls.defaults import *
try:
from django.conf.urls import patterns, include, url
except ImportError: # django < 1.4
from django.conf.urls.defaults import patterns, include, url

urlpatterns = patterns('reportengine.views',
# Listing of reports
url('^$', 'report_list', name='reports-list'),

# view report redirected to current date format (requires date_field argument)
url('^current/(?P<daterange>(day|week|month|year))/(?P<namespace>[-\w]+)/(?P<slug>[-\w]+)/$',
url('^current/(?P<daterange>(day|week|month|year))/(?P<namespace>[-\w]+)/(?P<slug>[-\w]+)/$',
'current_redirect', name='reports-current'),
# view report redirected to current date format with formatting specified
url('^current/(?P<daterange>(day|week|month|year))/(?P<namespace>[-\w]+)/(?P<slug>[-\w]+)/(?P<output>[-\w]+)/$',
url('^current/(?P<daterange>(day|week|month|year))/(?P<namespace>[-\w]+)/(?P<slug>[-\w]+)/(?P<output>[-\w]+)/$',
'current_redirect', name='reports-current-format'),
# specify range of report per time (requires date_field)
url('^date/(?P<year>\d+)/(?P<month>\d+)/(?P<day>\d+)/(?P<namespace>[-\w]+)/(?P<slug>[-\w]+)/$',
url('^date/(?P<year>\d+)/(?P<month>\d+)/(?P<day>\d+)/(?P<namespace>[-\w]+)/(?P<slug>[-\w]+)/$',
'day_redirect', name='reports-date-range'),
# specify range of report per time with formatting
url('^date/(?P<year>\d+)/(?P<month>\d+)/(?P<day>\d+)/(?P<namespace>[-\w]+)/(?P<slug>[-\w]+)/(?P<output>[-\w]+)/$',
url('^date/(?P<year>\d+)/(?P<month>\d+)/(?P<day>\d+)/(?P<namespace>[-\w]+)/(?P<slug>[-\w]+)/(?P<output>[-\w]+)/$',
'day_redirect', name='reports-date-range-format'),
# Show latest calendar of all date accessible reports
# Show latest calendar of all date accessible reports
url('^calendar/$', 'calendar_current_redirect', name='reports-calendar-current'),
# Show specific month's calendar of reports
url('^calendar/(?P<year>\d+)/(?P<month>\d+)/$', 'calendar_month_view', name='reports-calendar-month'),
Expand All @@ -31,10 +34,8 @@
url('^request/(?P<namespace>[-\w]+)/(?P<slug>[-\w]+)/$', 'request_report', name='reports-view'),
# view report in specified output format
#url('^request/(?P<namespace>[-\w]+)/(?P<slug>[-\w]+)/(?P<output>[-\w]+)/$', 'request_report', name='reports-view-format'),

url('^view/(?P<token>[\w\d]+)/$', 'view_report', name='reports-request-view'),
# view report in specified output format
url('^view/(?P<token>[\w\d]+)/(?P<output>[-\w]+)/$', 'view_report_export', name='reports-request-view-format'),
)