On 11/16/05, Bryan Murdock <[EMAIL PROTECTED]> wrote:
> On 11/16/05, Adrian Holovaty <[EMAIL PROTECTED]> wrote:
> >
> > On 11/16/05, Bryan Murdock <[EMAIL PROTECTED]> wrote:
> > > I did an svn up last night and now the admin interface doesn't work.
> > > Here is the error I'm getting:
> >
> > Hey Bryan,
> >
> > Are you using the new-admin branch? I can't recreate this error using trunk.
>
> Not that I know of. I originally checkout the django code back on
> September 17. I've done about three svn ups since then, most recently
> last night. Before that I svn upped just after the backwards
> incompatible changes to admin, changed my code and database and all
> that, and that all worked fine.
>
> I just started a new project from scratch and I still get the same error.
OK, I found it. In django/contrib/admin/templates/admin/base.html I have this:
{% if not user.is_anonymous %}
<<<<<<< .mine
<div id="user-tools">Welcome, <strong>{% if user.first_name
%}{{ user.first_name }}{% else %}{{ user.username }}{% endif
%}</strong>. <br />{% block userlinks %}<a
href="password_change/">Change password</a> / <a href="logout/">Log
out</a>{% endblock %}</div>
=======
<div id="user-tools">{% trans 'Welcome,' %} <strong>{% if
user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{%
endif %}</strong>. <br />{% block userlinks %}<a
href="/admin/password_change/">{% trans 'Change password' %}</a> / <a
href="/admin/logout/">{% trans 'Log out' %}</a>{% endblock %}</div>
>>>>>>> .r1263
{% endif %}
Um, yeah, gotta love cvs, oh, I mean subversion. I got it working now.
Bryan
