From 6b33c30616d544df2d78d0669809d5c106729482 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Tue, 28 Oct 2014 18:05:08 +0100 Subject: [PATCH] Fixing notifications __init__ because it was generating migration problems --- taiga/projects/attachments/api.py | 2 +- taiga/projects/issues/api.py | 2 +- taiga/projects/issues/models.py | 2 +- taiga/projects/milestones/api.py | 2 +- taiga/projects/milestones/models.py | 2 +- taiga/projects/notifications/__init__.py | 20 -------------------- taiga/projects/tasks/api.py | 2 +- taiga/projects/tasks/models.py | 2 +- taiga/projects/userstories/api.py | 2 +- taiga/projects/userstories/models.py | 2 +- taiga/projects/wiki/api.py | 2 +- taiga/projects/wiki/models.py | 2 +- 12 files changed, 11 insertions(+), 31 deletions(-) diff --git a/taiga/projects/attachments/api.py b/taiga/projects/attachments/api.py index d54e9aa4..a63b3aa4 100644 --- a/taiga/projects/attachments/api.py +++ b/taiga/projects/attachments/api.py @@ -31,7 +31,7 @@ from taiga.base import filters from taiga.base import exceptions as exc from taiga.users.models import User -from taiga.projects.notifications import WatchedResourceMixin +from taiga.projects.notifications.mixins import WatchedResourceMixin from taiga.projects.history.mixins import HistoryResourceMixin from . import permissions diff --git a/taiga/projects/issues/api.py b/taiga/projects/issues/api.py index e4701fd9..ab0878f0 100644 --- a/taiga/projects/issues/api.py +++ b/taiga/projects/issues/api.py @@ -30,7 +30,7 @@ from taiga.base import tags from taiga.users.models import User -from taiga.projects.notifications import WatchedResourceMixin +from taiga.projects.notifications.mixins import WatchedResourceMixin from taiga.projects.occ import OCCResourceMixin from taiga.projects.history.mixins import HistoryResourceMixin diff --git a/taiga/projects/issues/models.py b/taiga/projects/issues/models.py index e43bace3..35aad2f1 100644 --- a/taiga/projects/issues/models.py +++ b/taiga/projects/issues/models.py @@ -22,7 +22,7 @@ from django.dispatch import receiver from django.utils.translation import ugettext_lazy as _ from taiga.projects.occ import OCCModelMixin -from taiga.projects.notifications import WatchedModelMixin +from taiga.projects.notifications.mixins import WatchedModelMixin from taiga.projects.mixins.blocked import BlockedMixin from taiga.base.tags import TaggedMixin diff --git a/taiga/projects/milestones/api.py b/taiga/projects/milestones/api.py index 2d3a3e50..e5c58b76 100644 --- a/taiga/projects/milestones/api.py +++ b/taiga/projects/milestones/api.py @@ -25,7 +25,7 @@ from taiga.base import exceptions as exc from taiga.base.decorators import detail_route from taiga.base.api import ModelCrudViewSet -from taiga.projects.notifications import WatchedResourceMixin +from taiga.projects.notifications.mixins import WatchedResourceMixin from taiga.projects.history.mixins import HistoryResourceMixin diff --git a/taiga/projects/milestones/models.py b/taiga/projects/milestones/models.py index 899c8616..2e4e9199 100644 --- a/taiga/projects/milestones/models.py +++ b/taiga/projects/milestones/models.py @@ -22,7 +22,7 @@ from django.core.exceptions import ValidationError from taiga.base.utils.slug import slugify_uniquely from taiga.base.utils.dicts import dict_sum -from taiga.projects.notifications import WatchedModelMixin +from taiga.projects.notifications.mixins import WatchedModelMixin from taiga.projects.userstories.models import UserStory import itertools diff --git a/taiga/projects/notifications/__init__.py b/taiga/projects/notifications/__init__.py index 5978b735..e69de29b 100644 --- a/taiga/projects/notifications/__init__.py +++ b/taiga/projects/notifications/__init__.py @@ -1,20 +0,0 @@ -# Copyright (C) 2014 Andrey Antukh -# Copyright (C) 2014 Jesús Espino -# Copyright (C) 2014 David Barragán -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -from .mixins import WatchedResourceMixin -from .mixins import WatchedModelMixin - -__all__ = ["WatchedModelMixin", "WatchedResourceMixin"] diff --git a/taiga/projects/tasks/api.py b/taiga/projects/tasks/api.py index 348b4b7f..d3727b78 100644 --- a/taiga/projects/tasks/api.py +++ b/taiga/projects/tasks/api.py @@ -22,7 +22,7 @@ from taiga.base.decorators import list_route from taiga.base.api import ModelCrudViewSet from taiga.projects.models import Project -from taiga.projects.notifications import WatchedResourceMixin +from taiga.projects.notifications.mixins import WatchedResourceMixin from taiga.projects.history.mixins import HistoryResourceMixin from taiga.projects.occ import OCCResourceMixin diff --git a/taiga/projects/tasks/models.py b/taiga/projects/tasks/models.py index 9f71dd3b..25225d42 100644 --- a/taiga/projects/tasks/models.py +++ b/taiga/projects/tasks/models.py @@ -21,7 +21,7 @@ from django.utils import timezone from django.utils.translation import ugettext_lazy as _ from taiga.projects.occ import OCCModelMixin -from taiga.projects.notifications import WatchedModelMixin +from taiga.projects.notifications.mixins import WatchedModelMixin from taiga.projects.mixins.blocked import BlockedMixin from taiga.base.tags import TaggedMixin diff --git a/taiga/projects/userstories/api.py b/taiga/projects/userstories/api.py index f1a87c9a..f5648fec 100644 --- a/taiga/projects/userstories/api.py +++ b/taiga/projects/userstories/api.py @@ -30,7 +30,7 @@ from taiga.base import exceptions as exc from taiga.base.decorators import list_route from taiga.base.api import ModelCrudViewSet -from taiga.projects.notifications import WatchedResourceMixin +from taiga.projects.notifications.mixins import WatchedResourceMixin from taiga.projects.history.mixins import HistoryResourceMixin from taiga.projects.occ import OCCResourceMixin diff --git a/taiga/projects/userstories/models.py b/taiga/projects/userstories/models.py index 77e487eb..d0038441 100644 --- a/taiga/projects/userstories/models.py +++ b/taiga/projects/userstories/models.py @@ -21,7 +21,7 @@ from django.utils.translation import ugettext_lazy as _ from django.utils import timezone from taiga.projects.occ import OCCModelMixin -from taiga.projects.notifications import WatchedModelMixin +from taiga.projects.notifications.mixins import WatchedModelMixin from taiga.projects.mixins.blocked import BlockedMixin from taiga.base.tags import TaggedMixin diff --git a/taiga/projects/wiki/api.py b/taiga/projects/wiki/api.py index 6942e628..9970502d 100644 --- a/taiga/projects/wiki/api.py +++ b/taiga/projects/wiki/api.py @@ -28,7 +28,7 @@ from taiga.base.decorators import list_route from taiga.projects.models import Project from taiga.mdrender.service import render as mdrender -from taiga.projects.notifications import WatchedResourceMixin +from taiga.projects.notifications.mixins import WatchedResourceMixin from taiga.projects.history.mixins import HistoryResourceMixin from taiga.projects.occ import OCCResourceMixin diff --git a/taiga/projects/wiki/models.py b/taiga/projects/wiki/models.py index bfe926f8..4f8c6f4c 100644 --- a/taiga/projects/wiki/models.py +++ b/taiga/projects/wiki/models.py @@ -19,7 +19,7 @@ from django.contrib.contenttypes import generic from django.conf import settings from django.utils.translation import ugettext_lazy as _ from django.utils import timezone -from taiga.projects.notifications import WatchedModelMixin +from taiga.projects.notifications.mixins import WatchedModelMixin from taiga.projects.occ import OCCModelMixin