Move groupwiki from group to wiki

group/models.py

@@ -75,24 +75,6 @@ def msgreply_save_handler(sender, instance, **kwargs):
                                      detail=group_msg.id)
                 n.save()
 
-class GroupWikiManager(models.Manager):
-    def save_group_wiki(self, group_id, repo_id):
-        """
-        Create or update group wiki.
-        """
-        try:
-            groupwiki = self.get(group_id=group_id)
-            groupwiki.repo_id = repo_id
-        except self.model.DoesNotExist:
-            groupwiki = self.model(group_id=group_id, repo_id=repo_id)
-        groupwiki.save(using=self._db)
-        return groupwiki
-
-class GroupWiki(models.Model):
-    group_id = models.IntegerField(unique=True)
-    repo_id = models.CharField(max_length=36)
-    objects = GroupWikiManager()
-
 class PublicGroup(models.Model):
     """
     To record a public group

group/views.py

@@ -32,8 +32,7 @@ from seaserv import ccnet_threaded_rpc, seafserv_threaded_rpc, seafserv_rpc, \
 from pysearpc import SearpcError
 
 from decorators import group_staff_required
-from models import GroupMessage, MessageReply, MessageAttachment, GroupWiki, \
+from models import GroupMessage, MessageReply, MessageAttachment, PublicGroup
-    PublicGroup
 from forms import MessageForm, MessageReplyForm, GroupRecommendForm, \
     GroupAddForm, GroupJoinMsgForm, WikiCreateForm
 from signals import grpmsg_added, grpmsg_reply_added
@@ -45,7 +44,7 @@ from seahub.contacts.signals import mail_sended
 from seahub.notifications.models import UserNotification
 from wiki import get_group_wiki_repo, get_group_wiki_page, convert_wiki_link,\
     get_wiki_pages
-from wiki.models import WikiDoesNotExist, WikiPageMissing
+from wiki.models import WikiDoesNotExist, WikiPageMissing, GroupWiki
 from wiki.utils import clean_page_name, get_wiki_dirent
 from seahub.settings import SITE_ROOT, SITE_NAME, MEDIA_URL
 from seahub.shortcuts import get_first_object_or_none

wiki/models.py

@@ -23,3 +23,22 @@ class PersonalWiki(models.Model):
     username = models.CharField(max_length=255, unique=True)
     repo_id = models.CharField(max_length=36)
     objects = PersonalWikiManager()
+
+class GroupWikiManager(models.Manager):
+    def save_group_wiki(self, group_id, repo_id):
+        """
+        Create or update group wiki.
+        """
+        try:
+            groupwiki = self.get(group_id=group_id)
+            groupwiki.repo_id = repo_id
+        except self.model.DoesNotExist:
+            groupwiki = self.model(group_id=group_id, repo_id=repo_id)
+        groupwiki.save(using=self._db)
+        return groupwiki
+
+class GroupWiki(models.Model):
+    group_id = models.IntegerField(unique=True)
+    repo_id = models.CharField(max_length=36)
+    objects = GroupWikiManager()
+

wiki/utils.py

@@ -9,7 +9,6 @@ from django.utils.encoding import smart_str
 
 import seaserv
 from pysearpc import SearpcError
-from group.models import GroupWiki
 from seahub.utils import EMPTY_SHA1
 from seahub.utils.repo import list_dir_by_path
 from seahub.utils.slugify import slugify
@@ -17,8 +16,7 @@ from seahub.utils import render_error, render_permission_error, string2list, \
     gen_file_get_url, get_file_type_and_ext, \
     get_file_contributors
 from seahub.utils.file_types import IMAGE
-from models import WikiPageMissing, WikiDoesNotExist, \
+from models import WikiPageMissing, WikiDoesNotExist, GroupWiki, PersonalWiki
-    PersonalWiki
 
 __all__ = ["get_wiki_dirent", "clean_page_name"]