Permalink
Browse files

Fixed issues introduced by backporting from develop

  • Loading branch information...
1 parent ff85f58 commit efe82b8e8d7ac580b66812dd2365b1118aa98bbc Jonas Obrist committed Feb 22, 2011
Showing with 4 additions and 7 deletions.
  1. +1 −1 cms/test/testcases.py
  2. +2 −5 cms/tests/placeholder.py
  3. +1 −1 cms/tests/security.py
View
@@ -379,7 +379,7 @@ def add_plugin(self, user=None, page=None, placeholder=None, language='en', body
position=1,
language=language
)
- plugin_base.insert_at(None, position='last-child', save=False)
+ plugin_base.insert_at(None, position='last-child', commit=False)
plugin = Text(body=body)
plugin_base.set_base_attr(plugin)
View
@@ -1,11 +1,8 @@
# -*- coding: utf-8 -*-
from cms.exceptions import DuplicatePlaceholderWarning
from cms.models.placeholdermodel import Placeholder
-from cms.models.pluginmodel import CMSPlugin
-from cms.plugins.link.models import Link
-from cms.plugins.text.models import Text
-from cms.test_utils.testcases import CMSTestCase
-from cms.test_utils.util.context_managers import (SettingsOverride,
+from cms.test.testcases import CMSTestCase
+from cms.test.util.context_managers import (SettingsOverride,
UserLoginContext)
from cms.utils.placeholder import PlaceholderNoAction, MLNGPlaceholderActions
from cms.utils.plugins import get_placeholders
View
@@ -1,6 +1,6 @@
from cms.models.pluginmodel import CMSPlugin
from cms.plugins.text.models import Text
-from cms.test_utils.testcases import (CMSTestCase, URL_CMS_PLUGIN_ADD,
+from cms.test.testcases import (CMSTestCase, URL_CMS_PLUGIN_ADD,
URL_CMS_PLUGIN_EDIT, URL_CMS_PLUGIN_REMOVE)
from django.conf import settings
from django.core.urlresolvers import reverse

0 comments on commit efe82b8

Please sign in to comment.