Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fixed template syntax error, introduced in pull request #17 #20

Merged
merged 1 commit into from

3 participants

@yumike

No description provided.

@aaugustin
Owner

Our quality guidelines require that patches include tests. Unfortunately, pull request #17 was merged even though it didn't include a test and it was buggy.

Since the admin is currently broken in master, and since we try hard to keep trunk stable, I'll break the guidelines again and merge this pull request without adding a test -- sorry.

@aaugustin aaugustin merged commit 7c27d15 into from
@aviraldg

@aaugustin I'm really sorry about that; I didn't notice it ('$') there... :facepalm:

@aaugustin
Owner

@aviraldg Mistakes happen. It's the job of the committer to double check everything.

Since we can now merge pull requests over the web (without even copying the code to our local computer), running the tests requires a bit more effort. We need to adapt our ways of working on Django and not take too many shortcuts.

@aviraldg

@aaugustin I want to fix stuff though; a test for this would go in regressiontests.admin_views.tests.AdminViewBasicTest, right?

@aaugustin
Owner

Yes, this is a reasonable location. I suppose you'd have to log an admin user in, then change his password to something unusable, and then test that the response doesn't contain the "Change password".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Apr 29, 2012
  1. @yumike
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −1  django/contrib/admin/templates/admin/base.html
View
2  django/contrib/admin/templates/admin/base.html
@@ -34,7 +34,7 @@
{% endif %}
{% if user.has_usable_password %}
<a href="{% url 'admin:password_change' %}">{% trans 'Change password' %}</a> /
- {% endif $}
+ {% endif %}
<a href="{% url 'admin:logout' %}">{% trans 'Log out' %}</a>
{% endblock %}
</div>
Something went wrong with that request. Please try again.