Fixed cache problems when using sitetree_resync_apps (see #135, #166).

idlesign · Jul 30, 2015 · 8c3b386 · 8c3b386
1 parent b27b1d6
commit 8c3b386
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -6,6 +6,7 @@ Unreleased
 + Added Norwegian translation.
 + Added SITETREE_RAISE_ITEMS_ERRORS_ON_DEBUG setting (see #157).
 + Exposed SITETREE_CACHE_TIMEOUT setting.
+* Fixed cache problems when using sitetree_resync_apps  (see #135, #166).
 
 
 v1.4.0

diff --git a/sitetree/management/commands/sitetree_resync_apps.py b/sitetree/management/commands/sitetree_resync_apps.py
@@ -5,19 +5,25 @@
 
 from sitetree.utils import get_tree_model, import_project_sitetree_modules
 from sitetree.settings import APP_MODULE_NAME
+from sitetree.sitetreeapp import Cache
 
 
 MODEL_TREE_CLASS = get_tree_model()
 
 
 class Command(BaseCommand):
 
-    help = 'Places sitetrees of the project applications (defined in `app_name.sitetree.py`) into DB, replacing old ones if any.'
+    help = 'Places sitetrees of the project applications (defined in `app_name.sitetree.py`) into DB, ' \
+           'replacing old ones if any.'
+
     args = '[app_name app_name ...]'
+
     option_list = BaseCommand.option_list + (
-        make_option('--database', action='store', dest='database',
-            default=DEFAULT_DB_ALIAS, help='Nominates a specific database to place trees and items into. Defaults to the "default" database.'),
-        )
+        make_option(
+            '--database', action='store', dest='database', default=DEFAULT_DB_ALIAS,
+            help='Nominates a specific database to place trees and items into. Defaults to the "default" database.'
+        ),
+    )
 
     def handle(self, *apps, **options):
         using = options.get('database', DEFAULT_DB_ALIAS)
@@ -30,7 +36,7 @@ def handle(self, *apps, **options):
         for module in tree_modules:
             sitetrees = getattr(module, 'sitetrees', None)
             app = module.__dict__['__package__']
-            if not apps or (apps and app in apps):
+            if not apps or app in apps:
                 if sitetrees is not None:
                     self.stdout.write('Sitetrees found in `%s` app ...\n' % app)
                     for tree in sitetrees:
@@ -52,3 +58,5 @@ def handle(self, *apps, **options):
                             # Copy permissions to M2M field once `item`
                             # has been saved
                             item.access_permissions = item.permissions
+
+        Cache.reset()