Merge branch 'master' into develop

This commit is contained in:
Griatch 2018-08-16 21:09:29 +02:00
commit 1aaee33138
2 changed files with 19 additions and 7 deletions

View file

@ -437,7 +437,7 @@ class ObjectDBManager(TypedObjectManager):
"""
Create and return a new object as a copy of the original object. All
will be identical to the original except for the arguments given
specifically to this method.
specifically to this method. Object contents will not be copied.
Args:
original_object (Object): The object to make a copy from.
@ -502,6 +502,10 @@ class ObjectDBManager(TypedObjectManager):
for script in original_object.scripts.all():
ScriptDB.objects.copy_script(script, new_obj=new_object)
# copy over all tags, if any
for tag in original_object.tags.get(return_tagobj=True, return_list=True):
new_object.tags.add(tag=tag.key, category=tag.category, data=tag.data)
return new_object
def clear_all_sessids(self):