Moved old my/ code under ietfauth/

- Legacy-Id: 1737

ietf/ietfauth/urls.py

@@ -2,7 +2,6 @@
 
 from django.conf.urls.defaults import patterns
 from ietf.ietfauth import views
-from ietf.my.views import my
 
 urlpatterns = patterns('django.contrib.auth.views',
 	(r'^login/$', 'login'),
@@ -10,5 +9,5 @@ urlpatterns = patterns('django.contrib.auth.views',
 )
 urlpatterns += patterns('',
         (r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'registration/account_info.html'}),
-	(r'^profile/$', my)
+	(r'^profile/$', views.my)
 )

ietf/ietfauth/views.py

@@ -1,2 +1,17 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
+from django.template import RequestContext
+from django.shortcuts import render_to_response
+from django.contrib.auth.decorators import login_required
+from django.core.exceptions import ObjectDoesNotExist
+
+@login_required
+def my(request, addr=None):
+    try:
+	profile = request.user.get_profile()
+	person = profile.person
+    except ObjectDoesNotExist:
+	person = None
+    return render_to_response('registration/my.html', {
+	'me': person,
+	}, context_instance=RequestContext(request))

ietf/my/.gitignore

@@ -1,2 +0,0 @@
-/*.pyc
-/settings_local.py

ietf/my/__init__.py

@@ -1,2 +0,0 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
-

ietf/my/models.py

@@ -1,5 +0,0 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
-
-#from django.db import models
-
-# Create your models here.

ietf/my/tests.py

@@ -1,6 +0,0 @@
-
-from ietf.utils.test_utils import SimpleUrlTestCase
-
-class MyUrlTestCase(SimpleUrlTestCase):
-    def testUrls(self):
-        self.doTestUrls(__file__)

ietf/my/testurl.list

@@ -1,2 +0,0 @@
-#302	/my/
-#302	/my/ziggy/

ietf/my/urls.py

@@ -1,10 +0,0 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
-
-from django.conf.urls.defaults import patterns
-from ietf.my import views
-
-urlpatterns = patterns('',
-     # this is for testing
-     (r'^(?P<addr>.+)/$', views.my),
-     (r'^$', views.my),
-)

ietf/my/views.py

@@ -1,18 +0,0 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
-
-from django.template import RequestContext
-from django.shortcuts import render_to_response
-#from ietf.idtracker.models import PersonOrOrgInfo
-from django.contrib.auth.decorators import login_required
-from django.core.exceptions import ObjectDoesNotExist
-
-@login_required
-def my(request, addr=None):
-    try:
-	profile = request.user.get_profile()
-	person = profile.person
-    except ObjectDoesNotExist:
-	person = None
-    return render_to_response('my/my.html', {
-	'me': person,
-	}, context_instance=RequestContext(request))

ietf/settings.py

@@ -135,7 +135,6 @@ INSTALLED_APPS = (
     'ietf.liaisons',
     'ietf.mailinglists',
     'ietf.meeting',
-    'ietf.my',
     'ietf.proceedings',
     'ietf.redirects',
     'ietf.idrfc',

ietf/templates/my/.gitignore

@@ -1 +0,0 @@
-/*.pyc