Cleaned old unused custom function (now we use, as earlier, the django default view)

diff --git a/telemeta/templates/telemeta_default/login.html b/telemeta/templates/telemeta_default/login.html
index ce4250126956c14854d6a20b64e674beb7eda67f..5be82a9940e0dcaf564cf1652f52781d6a7c5f93 100644 (file)
--- a/telemeta/templates/telemeta_default/login.html
+++ b/telemeta/templates/telemeta_default/login.html
@@ -8,7 +8,7 @@
 <p class="login-error">{% trans "Your username and password didn't match. Please try again." %}</p>
 {% endif %}
 
-<form class="login" method="post" action="{% url telemeta-login_ %}">{% csrf_token %}
+<form class="login" method="post" action="{% url telemeta-login %}">{% csrf_token %}
 <p>
 {{ form.username.label_tag }}
 {{ form.username }}<br />

diff --git a/telemeta/urls.py b/telemeta/urls.py
index 35c539a5c46416cfebc78876f1bff059a32dac35..218ef40d6555e0dcbc0922e0c88d406063ec465b 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -182,8 +182,6 @@ urlpatterns = patterns('',
     url(r'^oai/.*$', web_view.handle_oai_request, name="telemeta-oai"),
 
     # Authentication
-     url(r'^login_/$', web_view.log_in_, {'template_name': 'telemeta/login.html'},
-        name="telemeta-login_"),
      url(r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'telemeta/login.html'},
         name="telemeta-login"),
     url(r'^logout/$', web_view.logout, name="telemeta-logout"),

diff --git a/telemeta/web/base.py b/telemeta/web/base.py
index fd36be4efc80fbe75ffa4a7c1114489312fbbfee..1ef1315543ecb52e3592ef3bd1348076ec02abcd 100644 (file)
--- a/telemeta/web/base.py
+++ b/telemeta/web/base.py
@@ -639,34 +639,6 @@ class WebView(object):
         auth.logout(request)
         return redirect('telemeta-home')
 
-    def log_in_(self, request, template_name):
-        print "before:"
-        print request.user
-        msg = []
-        if request.method == 'POST':
-            username = request.POST['username']
-            password = request.POST['password']
-            user = authenticate(username=username, password=password)
-            if user is not None:
-                if user.is_active:
-                    login(request, user)
-                    print "after:"
-                    print request.user
-                    return HttpResponseRedirect('/')
-                    # Redirect to a success page.
-                    msg.append("login successful")
-                else:
-                    msg.append("disabled account")
-                    # Return a 'disabled account' error message
-            else:
-                msg.append("disabled account")
-        
-        # Return an 'invalid login' error message.
-#        return render_flatpage(self, request, template_nam
-#        return django.contrib.auth.views.login(request, {'template_name': 'telemeta/login.html'});
-#        return render(request, template_name)
-#        return render_to_response('login.html', {'errors': msg})
-
         
     @jsonrpc_method('telemeta.add_marker')
     def add_marker(request, marker):