summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--taskapp/events/user.py19
-rw-r--r--urls.py4
2 files changed, 16 insertions, 7 deletions
diff --git a/taskapp/events/user.py b/taskapp/events/user.py
index 4447643..e2ac30a 100644
--- a/taskapp/events/user.py
+++ b/taskapp/events/user.py
@@ -26,13 +26,17 @@ def createUser(username,email,password,dob,gender):
gender : u'M'/u'F'
"""
- user = User(username=username, email=email)
- user.set_password(password)
- user.save()
- properties = {'dob':dob, 'gender':gender}
- user_profile = Profile(user=user)
- updateProfile(user_profile, properties)
- return user
+ try:
+ user = User.objects.get(username=username)
+ return user
+ except:
+ user = User(username=username, email=email)
+ user.set_password(password)
+ user.save()
+ properties = {'dob':dob, 'gender':gender}
+ user_profile = Profile(user=user)
+ updateProfile(user_profile, properties)
+ return user
def createSuUser(username,email,password,dob,gender):
""" create user using createUser method and set the is_superuser flag """
@@ -41,3 +45,4 @@ def createSuUser(username,email,password,dob,gender):
su_user.is_staff = True
su_user.is_superuser = True
su_user.save()
+ return su_user
diff --git a/urls.py b/urls.py
index 7bea08f..4625f6c 100644
--- a/urls.py
+++ b/urls.py
@@ -7,6 +7,8 @@ admin.autodiscover()
from pytask.taskapp.views.user import homepage, register, user_login, user_logout, view_my_profile, edit_my_profile, browse_users
from pytask.taskapp.views.task import browse_tasks, view_task, create_task, add_mentor, add_tasks, claim_task, assign_task
+from pytask.taskapp.utils.seed_db import seed_db
+
urlpatterns = patterns('',
# Example:
# (r'^pytask/', include('pytask.foo.urls')),
@@ -34,4 +36,6 @@ urlpatterns = patterns('',
(r'^user/view/uid=(\d+)$', view_my_profile),
(r'^user/edit/?$', edit_my_profile),
(r'^user/browse/?$',browse_users),
+
+ (r'^seed_db/$', seed_db),
)