From ad6dfbab7baa08745399044acda948233565c3d5 Mon Sep 17 00:00:00 2001
From: xiez <xiez1989@gmail.com>
Date: Mon, 30 Jul 2012 20:19:17 +0800
Subject: [PATCH] Add index to groupmessage and fix typo.

---
 base/models.py    |  2 +-
 contacts/views.py |  4 ++--
 group/models.py   |  2 +-
 views.py          | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/base/models.py b/base/models.py
index c82197f8cf..5eac114b0c 100644
--- a/base/models.py
+++ b/base/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 
 
-class UuidOjbidMap(models.Model):    
+class UuidObjidMap(models.Model):    
     """
     Model used for store crocdoc uuid and file object id mapping.
     """
diff --git a/contacts/views.py b/contacts/views.py
index f6d33dd28b..629a4aa7c0 100644
--- a/contacts/views.py
+++ b/contacts/views.py
@@ -99,7 +99,7 @@ def contact_edit(request):
                 contact = Contact.objects.get(user_email=user_email,
                                               contact_email=contact_email)
             except Contact.DoesNotExist:
-                return go_error(request, '用户不存在')
+                return go_error(request, '联系人不存在')
             else:
                 contact.contact_name = contact_name
                 contact.note = note
@@ -110,7 +110,7 @@ def contact_edit(request):
         c = Contact.objects.filter(user_email=request.user.username,
                                    contact_email=contact_email)
         if not c:
-            return go_error(request, '用户不存在')
+            return go_error(request, '联系人不存在')
         else:
             init_data = {'user_email':request.user.username,
                          'contact_email':contact_email,
diff --git a/group/models.py b/group/models.py
index e4322685dc..b97a5812e3 100644
--- a/group/models.py
+++ b/group/models.py
@@ -4,7 +4,7 @@ import os
 from django.db import models
 
 class GroupMessage(models.Model):
-    group_id = models.IntegerField()
+    group_id = models.IntegerField(db_index=True)
     from_email = models.EmailField()
     message = models.CharField(max_length=500)
     timestamp = models.DateTimeField(default=datetime.datetime.now)
diff --git a/views.py b/views.py
index ea6ad1444a..26e5b5ef86 100644
--- a/views.py
+++ b/views.py
@@ -35,7 +35,7 @@ from seaserv import ccnet_rpc, ccnet_threaded_rpc, get_repos, get_emailusers, \
 from pysearpc import SearpcError
 
 from seahub.base.accounts import CcnetUser
-from seahub.base.models import UuidOjbidMap
+from seahub.base.models import UuidObjidMap
 from seahub.contacts.models import Contact
 from seahub.notifications.models import UserNotification
 from seahub.organizations.utils import clear_org_ctx, access_org_repo
@@ -1887,8 +1887,8 @@ def crocodoc_upload(request):
         data = json.dumps([{'error': '缺少obj_id'}])
         return HttpResponse(data, status=500, content_type=content_type)
     try:
-        uo = UuidOjbidMap.objects.get(obj_id=obj_id)
-    except UuidOjbidMap.DoesNotExist:
+        uo = UuidObjidMap.objects.get(obj_id=obj_id)
+    except UuidObjidMap.DoesNotExist:
         uo = None
     if uo:
         data = json.dumps([{'uuid': uo.uuid, 'obj_id': obj_id}])
@@ -1933,7 +1933,7 @@ def crocodoc_status(request):
     ret_dict = ret_list[0]
     if ret_dict.has_key('error'):
         # Delete obj_id-uuid in db
-        UuidOjbidMap.objects.filter(obj_id=obj_id).delete()
+        UuidObjidMap.objects.filter(obj_id=obj_id).delete()
         
         data = json.dumps([{'error': '文档转换出错：' + ret_dict['error']}])
         return HttpResponse(data, status=500, content_type=content_type)
@@ -1948,7 +1948,7 @@ def crocodoc_status(request):
         return HttpResponse(data, status=200, content_type=content_type)
     elif status == 'DONE':
         # Cache obj_id and uuid in db
-        uo = UuidOjbidMap(uuid=uuids, obj_id=obj_id)
+        uo = UuidObjidMap(uuid=uuids, obj_id=obj_id)
         try:
             uo.save()
         except IntegrityError, e:
@@ -1958,7 +1958,7 @@ def crocodoc_status(request):
         return HttpResponse(data, status=200, content_type=content_type)
     elif status == 'ERROR':
         # Delete obj_id-uuid in db
-        UuidOjbidMap.objects.filter(obj_id=obj_id).delete()
+        UuidObjidMap.objects.filter(obj_id=obj_id).delete()
 
         err_msg = '文档转换出错:' + ret_dict['error'] if ret_dict.has_key('error') \
             else '文档转换出错'