diff options
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index a7bafd1fc..da4a98ce3 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -78,6 +78,7 @@ from django.db.utils import DatabaseError from django.template import Context, Template from django.template.defaultfilters import slugify from django.urls import reverse +from django.utils import timezone from django.utils.functional import lazy from django.utils.safestring import mark_safe from ishtar_common.data_importer import post_importer_action @@ -1967,7 +1968,7 @@ class StatsCache(models.Model): model = models.CharField(_("Model name"), max_length=200) model_pk = models.IntegerField(_("Associated primary key")) values = JSONField(default=dict, blank=True) - updated = models.DateTimeField(default=datetime.datetime.now) + updated = models.DateTimeField(default=timezone.now) update_requested = models.DateTimeField(blank=True, null=True) class Meta: @@ -2431,7 +2432,7 @@ class DocumentTemplate(models.Model): + os.path.sep + slugify(self.name.replace(" ", "_").lower()) + "-" - + datetime.datetime.now().strftime("%Y-%m-%d-%H%M%S") + + timezone.now().strftime("%Y-%m-%d-%H%M%S") ) suffix = "." + self.template.name.split(".")[-1] len_objects = len(objects) @@ -3449,7 +3450,7 @@ class GDPRPerson(models.Model): class GDPRLog(models.Model): user = models.ForeignKey(User, verbose_name=_("User"), on_delete=models.PROTECT, blank=True, null=True) - date = models.DateTimeField(verbose_name=_("Date"), default=datetime.datetime.now) + date = models.DateTimeField(verbose_name=_("Date"), default=timezone.now) ip = models.GenericIPAddressField(verbose_name=_("IP"), blank=True, null=True) routable_ip = models.BooleanField(verbose_name=_("Routable IP"), default=False) activity = models.CharField(_("Activity"), max_length=2, choices=GDPR_ACTIVITY) @@ -3950,7 +3951,7 @@ class BackgroundTask(models.Model): state = models.CharField( _("State"), max_length=2, choices=TASK_STATE, default="S" ) - creation_date = models.DateTimeField(default=datetime.datetime.now) + creation_date = models.DateTimeField(default=timezone.now) launch_date = models.DateTimeField(null=True, blank=True) finished_date = models.DateTimeField(null=True, blank=True) result = models.FileField(_("Result"), null=True, blank=True) @@ -5584,7 +5585,7 @@ class Document( for path in self._get_base_image_paths(): if path: return path - n = datetime.datetime.now() + n = timezone.now() return "upload/{}/{:02d}/{:02d}".format(n.year, n.month, n.day) def _get_available_filename(self, path, test_link=None): @@ -6021,7 +6022,7 @@ class AdministrationTask(models.Model): state = models.CharField( _("State"), max_length=2, choices=SCRIPT_STATE, default="S" ) - creation_date = models.DateTimeField(default=datetime.datetime.now) + creation_date = models.DateTimeField(default=timezone.now) launch_date = models.DateTimeField(null=True, blank=True) finished_date = models.DateTimeField(null=True, blank=True) result = models.TextField(_("Result"), blank=True, default="") @@ -6041,7 +6042,7 @@ class AdministrationTask(models.Model): def execute(self): if self.state != "S": return - self.launch_date = datetime.datetime.now() + self.launch_date = timezone.now() script_dir = settings.ISHTAR_SCRIPT_DIR @@ -6053,7 +6054,7 @@ class AdministrationTask(models.Model): ) ) self.state = "FE" - self.finished_date = datetime.datetime.now() + self.finished_date = timezone.now() self.save() return @@ -6067,7 +6068,7 @@ class AdministrationTask(models.Model): ) ) self.state = "FE" - self.finished_date = datetime.datetime.now() + self.finished_date = timezone.now() self.save() return @@ -6076,7 +6077,7 @@ class AdministrationTask(models.Model): _('Your ISHTAR_SCRIPT_DIR: "{}" is not a valid directory.') ).format(script_dir) self.state = "FE" - self.finished_date = datetime.datetime.now() + self.finished_date = timezone.now() self.save() return @@ -6096,13 +6097,13 @@ class AdministrationTask(models.Model): ) ).format(self.script.path) self.state = "FE" - self.finished_date = datetime.datetime.now() + self.finished_date = timezone.now() self.save() return self.state = "P" self.save() - self.finished_date = datetime.datetime.now() + self.finished_date = timezone.now() try: # nosec: only script inside the script directory can be executed # this script directory is not web available @@ -6114,7 +6115,7 @@ class AdministrationTask(models.Model): self.save() return - self.finished_date = datetime.datetime.now() + self.finished_date = timezone.now() if stderr: self.state = "FE" self.result = "Error: {}".format(stderr.decode("utf-8")) @@ -6179,7 +6180,7 @@ class ExportTask(models.Model): export_dir = models.BooleanField(_("Export directory"), default=True) export_docs = models.BooleanField(_("Export documents"), default=True) export_items = models.BooleanField(_("Export main items"), default=True) - creation_date = models.DateTimeField(default=datetime.datetime.now) + creation_date = models.DateTimeField(default=timezone.now) launch_date = models.DateTimeField(null=True, blank=True) finished_date = models.DateTimeField(null=True, blank=True) result = models.FileField( @@ -6218,7 +6219,7 @@ class ExportTask(models.Model): class ImportTask(models.Model): - creation_date = models.DateTimeField(default=datetime.datetime.now) + creation_date = models.DateTimeField(default=timezone.now) launch_date = models.DateTimeField(null=True, blank=True) finished_date = models.DateTimeField(null=True, blank=True) import_user = models.ForeignKey( |