Skip to content

Commit d0843d3

Browse files
authored
Merge pull request #6 from acoollevel/master
Thanks for all this. LGTM!
2 parents 38b736a + f39ecf9 commit d0843d3

9 files changed

Lines changed: 11 additions & 11 deletions

File tree

File renamed without changes.

error_tracker/django/templates/detail.html renamed to error_tracker/django/templates/error_tracker/detail.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'base.html' %}
1+
{% extends 'error_tracker/base.html' %}
22
{% load error_tracker %}
33
{% block content_block %}
44
<style>
@@ -30,7 +30,7 @@ <h2 class="text-center"><a href="{% url 'view_errors' %}">Errors Seen</a></h2>
3030
<div><strong>Request data: </strong>{{ obj.request_data }}</div>
3131
<hr/>
3232
<div><strong>Exception detail: </strong><br/>
33-
{{ obj.traceback|replace_new_line_with_br|safe }}</div>
33+
{{ obj.traceback|escape|replace_new_line_with_br|safe }}</div>
3434
</div>
3535
{% endif %}
3636
{% endblock %}

error_tracker/django/templates/list.html renamed to error_tracker/django/templates/error_tracker/list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'base.html' %}
1+
{% extends 'error_tracker/base.html' %}
22
{% block content_block %}
33
{% if error %}
44
<h1 class="text-center alert alert-danger">{{ error }}</h1>

error_tracker/django/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ def notify(self, request, exception,
9696
class DefaultDjangoViewPermission(ViewPermissionMixin):
9797

9898
def __call__(self, request):
99-
if hasattr(request.user, "is_admin"):
100-
return request.user.is_admin()
99+
if hasattr(request.user, "is_superuser"):
100+
return request.user.is_superuser
101101
return False
102102

103103

error_tracker/django/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def view_list(request):
4545
prev_url = reverse('view_errors') + "?page=" + str(errors.prev_num) \
4646
if errors.has_prev else None
4747

48-
return render(request, template_name='list.html',
48+
return render(request, template_name='error_tracker/list.html',
4949
context=dict(error=error, title=title, errors=errors,
5050
next_url=next_url, prev_url=prev_url))
5151

@@ -77,5 +77,5 @@ def detail(request, rhash):
7777
if obj is None:
7878
raise Http404
7979
title = "%s : %s" % (obj.method, obj.path)
80-
return render(request, template_name='detail.html',
80+
return render(request, template_name='error_tracker/detail.html',
8181
context=dict(error=error, title=title, obj=obj))
File renamed without changes.

error_tracker/flask/templates/detail.html renamed to error_tracker/flask/templates/error_tracker/detail.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'base.html' %}
1+
{% extends 'error_tracker/base.html' %}
22
{% block content_block %}
33
<style>
44
hr {

error_tracker/flask/templates/list.html renamed to error_tracker/flask/templates/error_tracker/list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends 'base.html' %}
1+
{% extends 'error_tracker/base.html' %}
22
{% block content_block %}
33
{% if error %}
44
<h1 class="text-center alert alert-danger">{{ error }}</h1>

error_tracker/flask/view.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def view_list():
3636
if errors.has_next else None
3737
prev_url = url_for('app_error.view_list', page=errors.prev_num) \
3838
if errors.has_prev else None
39-
return render_template('list.html', error=error, title=title, errors=errors,
39+
return render_template('error_tracker/list.html', error=error, title=title, errors=errors,
4040
next_url=next_url, prev_url=prev_url)
4141

4242
@blueprint.route('/<string:rhash>')
@@ -54,7 +54,7 @@ def view_detail(rhash):
5454
abort(404)
5555
title = "%s : %s" % (obj.method, obj.path)
5656

57-
return render_template('detail.html', error=error, title=title, obj=obj)
57+
return render_template('error_tracker/detail.html', error=error, title=title, obj=obj)
5858

5959
@blueprint.route('/delete/<string:rhash>')
6060
def view_delete(rhash):

0 commit comments

Comments
 (0)