Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent write of SERVER_RESTART_REQUIRED setting when importing dataset (#3249)

Browse Source
This commit is contained in:
Oliver 2022-06-24 20:42:55 +10:00 committed by GitHub
parent daf019c13a
commit 5b54979202
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/common/apps.py
View File

@ -4,6 +4,8 @@ import logging
from django.apps import AppConfig from django.apps import AppConfig
from InvenTree.ready import isImportingData
logger = logging.getLogger('inventree') logger = logging.getLogger('inventree')
@ -26,6 +28,8 @@ class CommonConfig(AppConfig):
if common.models.InvenTreeSetting.get_setting('SERVER_RESTART_REQUIRED', backup_value=False, create=False, cache=False): if common.models.InvenTreeSetting.get_setting('SERVER_RESTART_REQUIRED', backup_value=False, create=False, cache=False):
logger.info("Clearing SERVER_RESTART_REQUIRED flag") logger.info("Clearing SERVER_RESTART_REQUIRED flag")
if not isImportingData():
common.models.InvenTreeSetting.set_setting('SERVER_RESTART_REQUIRED', False, None) common.models.InvenTreeSetting.set_setting('SERVER_RESTART_REQUIRED', False, None)
except Exception: except Exception:
pass pass

3
InvenTree/common/models.py
View File

@ -37,6 +37,7 @@ from rest_framework.exceptions import PermissionDenied
import InvenTree.fields import InvenTree.fields
import InvenTree.helpers import InvenTree.helpers
import InvenTree.ready
import InvenTree.validators import InvenTree.validators
logger = logging.getLogger('inventree') logger = logging.getLogger('inventree')
@ -748,7 +749,7 @@ class InvenTreeSetting(BaseInvenTreeSetting):
""" """
super().save() super().save()
if self.requires_restart(): if self.requires_restart() and not InvenTree.ready.isImportingData():
InvenTreeSetting.set_setting('SERVER_RESTART_REQUIRED', True, None) InvenTreeSetting.set_setting('SERVER_RESTART_REQUIRED', True, None)
""" """