Permalink
Browse files

moved remnants of publisher

  • Loading branch information...
1 parent 1d99188 commit 65e94a71073c241e2f9f002206cdcd0dfb060b31 @fivethreeo fivethreeo committed Feb 3, 2011
View
2 cms/models/managers.py
@@ -4,7 +4,7 @@
from django.contrib.sites.models import Site
from django.db.models import Q
from cms.exceptions import NoPermissionsException
-from publisher import PublisherManager
+from cms.publisher import PublisherManager
from cms.models.query import PageQuerySet
from cms.utils.i18n import get_fallback_languages
View
4 cms/models/metaclasses.py
@@ -1,9 +1,9 @@
# -*- coding: utf-8 -*-
from django.conf import settings
from django.db.models.base import ModelBase
-from publisher.manager import PublisherManager
+from cms.publisher.manager import PublisherManager
from mptt.models import MPTTModelBase
-from publisher.options import PublisherOptions
+from cms.publisher.options import PublisherOptions
class PageMetaClass(MPTTModelBase):
View
2 cms/models/moderatormodels.py
@@ -122,4 +122,4 @@ class Meta:
__unicode__ = lambda self: "%s: %s" % (unicode(self.page), self.get_action_display())
-
+
View
2 cms/models/pagemodel.py
@@ -21,7 +21,7 @@
from django.utils.translation import ugettext_lazy as _, get_language, ugettext
from menus.menu_pool import menu_pool
from os.path import join
-from publisher.errors import MpttPublisherCantPublish
+from cms.publisher.errors import MpttPublisherCantPublish
from mptt.models import MPTTModel
import copy
View
2 cms/models/query.py
@@ -2,7 +2,7 @@
from datetime import datetime
from django.db.models import Q
from django.contrib.sites.models import Site
-from publisher.query import PublisherQuerySet
+from cms.publisher.query import PublisherQuerySet
from django.conf import settings
from cms.exceptions import NoHomeFound
View
0 publisher/__init__.py → cms/publisher/__init__.py
File renamed without changes.
View
2 publisher/errors.py → cms/publisher/errors.py
@@ -4,4 +4,4 @@ class PublisherCantPublish(Exception):
class MpttPublisherCantPublish(PublisherCantPublish):
"""Node is under mptt and can't be published because node parent isn't
- published."""
+ published."""
View
4 publisher/manager.py → cms/publisher/manager.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from django.db import models
-from publisher.query import PublisherQuerySet
+from cms.publisher.query import PublisherQuerySet
class PublisherManager(models.Manager):
"""Manager with some support handling publisher.
@@ -22,4 +22,4 @@ def all(self):
"object is not allowed. Please use drafts() or public() method "
"instead. If this isn't accident use get_query_set().all() for "
"all instances.")
- """
+ """
View
0 publisher/models.py → cms/publisher/models.py
File renamed without changes.
View
0 publisher/options.py → cms/publisher/options.py
File renamed without changes.
View
2 publisher/query.py → cms/publisher/query.py
@@ -8,4 +8,4 @@ def drafts(self):
return self.filter(publisher_is_draft=True)
def public(self):
- return self.filter(publisher_is_draft=False)
+ return self.filter(publisher_is_draft=False)
View
3 example/settings.py
@@ -86,7 +86,6 @@
'django.contrib.admin',
'django.contrib.sites',
'cms',
- 'publisher',
'menus',
'cms.plugins.text',
'cms.plugins.picture',
@@ -167,4 +166,4 @@
try:
from local_settings import *
except ImportError:
- pass
+ pass

0 comments on commit 65e94a7

Please sign in to comment.