Fix a lot of import fixes.

greenmine/base/permissions.py

@@ -2,7 +2,7 @@
 
 from rest_framework import permissions
 
-from greenmine.scrum.models import Membership
+from greenmine.projects.models import Membership
 
 
 def has_project_perm(user, project, perm):

greenmine/base/searches/api.py

@@ -14,7 +14,7 @@ from .serializers import SearchSerializer
 
 class SearchViewSet(viewsets.ViewSet):
     def list(self, request, **kwargs):
-        project_model = get_model("scrum", "Project")
+        project_model = get_model("projects", "Project")
         text = request.QUERY_PARAMS.get('text', "")
         project_id = request.QUERY_PARAMS.get('project', None)
 
@@ -34,7 +34,7 @@ class SearchViewSet(viewsets.ViewSet):
         return Response(return_data.data)
 
     def _get_project(self, project_id):
-        project_model = get_model("scrum", "Project")
+        project_model = get_model("projects", "Project")
         own_projects = (project_model.objects
                             .filter(members=self.request.user))
 

greenmine/base/users/api.py

@@ -42,7 +42,7 @@ class UsersViewSet(viewsets.ViewSet):
     permission_classes = (IsAuthenticated,)
 
     def get_list_queryset(self):
-        project_model = get_model("scrum", "Project")
+        project_model = get_model("projects", "Project")
         own_projects = (project_model.objects
                             .filter(members=self.request.user))
 

greenmine/projects/documents/models.py

@@ -19,7 +19,7 @@ class Document(models.Model):
                 verbose_name=_('created date'))
     modified_date = models.DateTimeField(auto_now=True, null=False, blank=False,
                 verbose_name=_('modified date'))
-    project = models.ForeignKey('scrum.Project', null=False, blank=False,
+    project = models.ForeignKey('projects.Project', null=False, blank=False,
                 related_name='documents',
                 verbose_name=_('project'))
     owner = models.ForeignKey(settings.AUTH_USER_MODEL, null=False, blank=False,

greenmine/projects/issues/api.py

@@ -9,6 +9,7 @@ from greenmine.base.api import ModelCrudViewSet, ModelListViewSet
 from greenmine.base.notifications.api import NotificationSenderMixin
 from greenmine.projects.permissions import AttachmentPermission
 from greenmine.projects.serializers import AttachmentSerializer
+from greenmine.projects.models import Attachment
 
 from . import models
 from . import permissions
@@ -18,14 +19,14 @@ from . import serializers
 class SeverityViewSet(ModelListViewSet):
     model = models.Severity
     serializer_class = serializers.SeveritySerializer
-    permission_classes = (IsAuthenticated, permissions.SeverityiPermission)
+    permission_classes = (IsAuthenticated, permissions.SeverityPermission)
     filter_backends = (filters.IsProjectMemberFilterBackend,)
     filter_fields = ("project",)
 
 
 class PriorityViewSet(ModelListViewSet):
     model = models.Priority
-    serializer_class = serializer.PrioritySerializer
+    serializer_class = serializers.PrioritySerializer
     permission_classes = (IsAuthenticated, permissions.PriorityPermission)
     filter_backends = (filters.IsProjectMemberFilterBackend,)
     filter_fields = ("project",)
@@ -33,7 +34,7 @@ class PriorityViewSet(ModelListViewSet):
 
 class IssueTypeViewSet(ModelListViewSet):
     model = models.IssueType
-    serializer_class = serializer.IssueTypeSerializer
+    serializer_class = serializers.IssueTypeSerializer
     permission_classes = (IsAuthenticated, permissions.IssueTypePermission)
     filter_backends = (filters.IsProjectMemberFilterBackend,)
     filter_fields = ("project",)

greenmine/projects/milestones/api.py

@@ -3,8 +3,7 @@
 from rest_framework.permissions import IsAuthenticated
 
 from greenmine.base import filters
-from greenmine.base.api import ModelCrudViewSet,
+from greenmine.base.api import ModelCrudViewSet
-
 from greenmine.base.notifications.api import NotificationSenderMixin
 
 from . import serializers

greenmine/projects/milestones/serializers.py

@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 
+import json
+import reversion
+
 from rest_framework import serializers
 
-from greenmine.projects.userstories.serializers import user_stories
+from ..userstories.serializers import UserStorySerializer
-
 from . import models
 
-import json, reversion
 
 
 class MilestoneSerializer(serializers.ModelSerializer):

greenmine/projects/serializers.py

@@ -17,7 +17,7 @@ class AttachmentSerializer(serializers.ModelSerializer):
         return None
 
     class Meta:
-        model = Attachment
+        model = models.Attachment
         fields = ("id", "project", "owner", "attached_file",
                   "created_date", "object_id", "url")
         read_only_fields = ("owner",)
@@ -29,4 +29,4 @@ class ProjectSerializer(serializers.ModelSerializer):
     list_of_milestones = serializers.Field(source="list_of_milestones")
 
     class Meta:
-        model = Project
+        model = models.Project

greenmine/projects/tasks/api.py

@@ -5,17 +5,15 @@ from django.contrib.contenttypes.models import ContentType
 from rest_framework.permissions import IsAuthenticated
 
 from greenmine.base import filters
-from greenmine.base.api import (
+from greenmine.base.api import ModelCrudViewSet, ModelListViewSet
-    ModelCrudViewSet,
-    ModelListViewSet
-)
 from greenmine.base.notifications.api import NotificationSenderMixin
 from greenmine.projects.permissions import AttachmentPermission
 from greenmine.projects.serializers import AttachmentSerializer
+from greenmine.projects.models import Attachment
 
-from . import serializers
 from . import models
 from . import permissions
+from . import serializers
 
 
 class TaskStatusViewSet(ModelListViewSet):

greenmine/projects/userstories/api.py

@@ -3,10 +3,7 @@
 from rest_framework.permissions import IsAuthenticated
 
 from greenmine.base import filters
-from greenmine.base.api import (
+from greenmine.base.api import ModelCrudViewSet, ModelListViewSet
-    ModelCrudViewSet,
-    ModelListViewSet
-)
 from greenmine.base.notifications.api import NotificationSenderMixin
 
 from . import serializers
@@ -16,7 +13,7 @@ from . import permissions
 
 class PointsViewSet(ModelListViewSet):
     model = models.Points
-    serializer_class = serializer.PointsSerializer
+    serializer_class = serializers.PointsSerializer
     permission_classes = (IsAuthenticated, permissions.PointsPermission)
     filter_backends = (filters.IsProjectMemberFilterBackend,)
     filter_fields = ('project',)
@@ -32,7 +29,7 @@ class UserStoryStatusViewSet(ModelListViewSet):
 
 class UserStoryViewSet(NotificationSenderMixin, ModelCrudViewSet):
     model = models.UserStory
-    serializer_class = serializersUserStorySerializer
+    serializer_class = serializers.UserStorySerializer
     permission_classes = (IsAuthenticated, permissions.UserStoryPermission)
     filter_backends = (filters.IsProjectMemberFilterBackend,)
     filter_fields = ['project', 'milestone', 'milestone__isnull']

greenmine/projects/userstories/permissions.py

@@ -3,7 +3,7 @@
 from greenmine.base.permissions import BasePermission
 
 
-class PointsDetailPermission(BasePermission):
+class PointsPermission(BasePermission):
     get_permission = "view_points"
     put_permission = "severity_points"
     patch_permission = "severity_points"
@@ -12,7 +12,7 @@ class PointsDetailPermission(BasePermission):
     path_to_project =  ["project"]
 
 
-class UserStoryStatusDetailPermission(BasePermission):
+class UserStoryStatusPermission(BasePermission):
     get_permission = "view_userstorystatus"
     put_permission = "change_userstorystatus"
     patch_permission = "change_userstorystatus"

greenmine/projects/wiki/admin.py

@@ -2,7 +2,7 @@
 
 from django.contrib import admin
 
-from greenmine.wiki.models import WikiPage, WikiPageAttachment
+from greenmine.projects.wiki.models import WikiPage, WikiPageAttachment
 
 
 class WikiPageAdmin(admin.ModelAdmin):