Merge pull request #225 from idlesign/feat/major_refactoring

Major refactoring.

sitetree/fields.py

@@ -41,10 +41,8 @@ def _build_choices(self):
         tree_token = u'sitetree_tree from "%s" template "%s"' % (self.tree, self.template)
 
         context_kwargs = {'current_app': 'admin'}
-        if VERSION >= (1, 8):
-            context = template.Context(context_kwargs)
-        else:
-            context = template.Context(**context_kwargs)
+        context = template.Context(context_kwargs) if VERSION >= (1, 8) else template.Context(**context_kwargs)
+        context.update({'request': object()})
 
         choices_str = sitetree_tree(
             Parser(None), Token(token_type=TOKEN_BLOCK, contents=tree_token)

sitetree/management/commands/sitetreeload.py

@@ -30,7 +30,7 @@
         help='Mode to put data into DB. Variants: `replace`, `append`.'),
 
     CommandOption(
-        '--items_into_tree', action='store', dest='into_tree', default=None,
+        '--items_into_tree', action='store', dest='items_into_tree', default=None,
         help='Import only tree items data into tree with given alias.'),
 ))
 
@@ -50,7 +50,7 @@ def handle(self, *fixture_files, **options):
 
         using = options.get('database', DEFAULT_DB_ALIAS)
         mode = options.get('mode', 'append')
-        items_into_tree = options.get('into_tree', None)
+        items_into_tree = options.get('items_into_tree', None)
 
         if items_into_tree is not None:
             try:
@@ -78,11 +78,8 @@ def handle(self, *fixture_files, **options):
         loaded_object_count = 0
 
         if mode == 'replace':
-            try:
-                MODEL_TREE_CLASS.objects.all().delete()
-                MODEL_TREE_ITEM_CLASS.objects.all().delete()
-            except ObjectDoesNotExist:
-                pass
+            MODEL_TREE_CLASS.objects.all().delete()
+            MODEL_TREE_ITEM_CLASS.objects.all().delete()
 
         for fixture_file in fixture_files: