Skip to content

Commit

Permalink
changed user to owner
Browse files Browse the repository at this point in the history
  • Loading branch information
brosner committed Apr 15, 2010
1 parent c8d18d9 commit 37b34c0
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion contacts_import/backends/persistance.py
Expand Up @@ -23,7 +23,7 @@ def default_status(self):


def persist_contact(self, contact, status, credentials): def persist_contact(self, contact, status, credentials):
obj, created = TransientContact.objects.get_or_create( obj, created = TransientContact.objects.get_or_create(
user = credentials["user"], owner = credentials["user"],
email = contact["email"], email = contact["email"],
defaults = {"name": contact["name"]} defaults = {"name": contact["name"]}
) )
Expand Down
2 changes: 1 addition & 1 deletion contacts_import/models.py
Expand Up @@ -7,7 +7,7 @@


class TransientContact(models.Model): class TransientContact(models.Model):
# The user who created this contact # The user who created this contact
user = models.ForeignKey(User, related_name="contacts") owner = models.ForeignKey(User, related_name="imported_contacts")


name = models.CharField(max_length=100, blank=True) name = models.CharField(max_length=100, blank=True)
email = models.EmailField() email = models.EmailField()
Expand Down
4 changes: 2 additions & 2 deletions contacts_import/views.py
Expand Up @@ -76,12 +76,12 @@ def import_contacts(request, template_name="contacts_import/import_contacts.html
return HttpResponseRedirect("%s?page=%s" % (request.path, page_num-1)) return HttpResponseRedirect("%s?page=%s" % (request.path, page_num-1))
elif "finish" in request.POST: elif "finish" in request.POST:
if not selected: if not selected:
TransientContact.objects.filter(user=request.user).delete() TransientContact.objects.filter(owner=request.user).delete()
return HttpResponseRedirect(reverse("import_contacts")) return HttpResponseRedirect(reverse("import_contacts"))
# give control over to the callback which is required to # give control over to the callback which is required to
# return a HttpResponse # return a HttpResponse
response = callback(request, selected) response = callback(request, selected)
TransientContact.objects.filter(user=request.user).delete() TransientContact.objects.filter(owner=request.user).delete()
return response return response
else: else:
form = VcardImportForm() form = VcardImportForm()
Expand Down

0 comments on commit 37b34c0

Please sign in to comment.