Merge pull request #895 from kawazrepos/892

プロジェクトを下書きにしてから公開すると参加者が居なくなるバグを修正

config/requirements.txt

@@ -3,7 +3,7 @@ pytz
 pillow
 markdown2==2.3.0
 djangorestframework>=3.0.1
-django-permission>=0.8.3
+django-permission
 django-filter
 django-roughpages>=0.1.2
 django-thumbnailfield>=0.2.3

src/kawaz/apps/projects/models.py

@@ -242,7 +242,7 @@ def join_administrator(**kwargs):
     """
     created = kwargs.get('created')
     instance = kwargs.get('instance')
-    if created and instance.pub_state != 'draft':
+    if instance.pub_state != 'draft' and not instance.administrator in instance.members.all():
         instance.join(instance.administrator)
 
 from permission import add_permission_logic

src/kawaz/apps/projects/tests/test_models.py

@@ -234,6 +234,14 @@ def test_administrator_is_member(self):
         project = ProjectFactory(administrator=user)
         self.assertTrue(project.is_member(user))
 
+    def test_administrator_can_join_automatically_draft(self):
+        """
+        下書き状態のイベントでも作成時に自動的に管理者がプロジェクトメンバーになる
+        """
+        user = PersonaFactory()
+        project = ProjectFactory(administrator=user, status='draft')
+        self.assertTrue(project.is_member(user))
+
     def test_quit(self):
         '''Tests can remove member correctly'''
         project = ProjectFactory()