14799 Fix sync of scripts from data source (#15303)
* 14799 fix script creation from data-source * 14799 dont cache module_scripts * 14799 fix sync_classes call
This commit is contained in:
parent
817e009e4f
commit
0cff4c9795
|
@ -89,6 +89,9 @@ class ManagedFile(SyncedDataMixin, models.Model):
|
||||||
def clean(self):
|
def clean(self):
|
||||||
super().clean()
|
super().clean()
|
||||||
|
|
||||||
|
if self.data_file and not self.file_path:
|
||||||
|
self.file_path = os.path.basename(self.data_path)
|
||||||
|
|
||||||
# Ensure that the file root and path make a unique pair
|
# Ensure that the file root and path make a unique pair
|
||||||
if self._meta.model.objects.filter(file_root=self.file_root, file_path=self.file_path).exclude(pk=self.pk).exists():
|
if self._meta.model.objects.filter(file_root=self.file_root, file_path=self.file_path).exclude(pk=self.pk).exists():
|
||||||
raise ValidationError(
|
raise ValidationError(
|
||||||
|
|
|
@ -108,7 +108,7 @@ class ScriptModule(PythonModuleMixin, JobsMixin, ManagedFile):
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.python_name
|
return self.python_name
|
||||||
|
|
||||||
@cached_property
|
@property
|
||||||
def module_scripts(self):
|
def module_scripts(self):
|
||||||
|
|
||||||
def _get_name(cls):
|
def _get_name(cls):
|
||||||
|
@ -137,9 +137,13 @@ class ScriptModule(PythonModuleMixin, JobsMixin, ManagedFile):
|
||||||
Syncs the file-based module to the database, adding and removing individual Script objects
|
Syncs the file-based module to the database, adding and removing individual Script objects
|
||||||
in the database as needed.
|
in the database as needed.
|
||||||
"""
|
"""
|
||||||
db_classes = {
|
if self.id:
|
||||||
script.name: script for script in self.scripts.all()
|
db_classes = {
|
||||||
}
|
script.name: script for script in self.scripts.all()
|
||||||
|
}
|
||||||
|
else:
|
||||||
|
db_classes = {}
|
||||||
|
|
||||||
db_classes_set = set(db_classes.keys())
|
db_classes_set = set(db_classes.keys())
|
||||||
module_classes_set = set(self.module_scripts.keys())
|
module_classes_set = set(self.module_scripts.keys())
|
||||||
|
|
||||||
|
@ -158,10 +162,10 @@ class ScriptModule(PythonModuleMixin, JobsMixin, ManagedFile):
|
||||||
|
|
||||||
def sync_data(self):
|
def sync_data(self):
|
||||||
super().sync_data()
|
super().sync_data()
|
||||||
self.sync_classes()
|
|
||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
self.file_root = ManagedFileRootPathChoices.SCRIPTS
|
self.file_root = ManagedFileRootPathChoices.SCRIPTS
|
||||||
|
self.sync_classes()
|
||||||
return super().save(*args, **kwargs)
|
return super().save(*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue