From 4f7ab695082a644d24dd7cd70006a36e6a09a328 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Thu, 31 Oct 2019 18:05:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=B2=A1=E6=9C=89=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=20history=20=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/ops/models/adhoc.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/ops/models/adhoc.py b/apps/ops/models/adhoc.py index 6cc802488..b9c1c4a74 100644 --- a/apps/ops/models/adhoc.py +++ b/apps/ops/models/adhoc.py @@ -242,6 +242,7 @@ class AdHoc(models.Model): except AttributeError: hid = str(uuid.uuid4()) history = AdHocRunHistory(id=hid, adhoc=self, task=self.task) + history.save() time_start = time.time() date_start = timezone.now() is_success = False From 28ad362b8d77d2f8d099573a270b22165c1232d4 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 1 Nov 2019 14:09:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/backends/db.py | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/assets/backends/db.py b/apps/assets/backends/db.py index 40fa41444..f702060fb 100644 --- a/apps/assets/backends/db.py +++ b/apps/assets/backends/db.py @@ -26,4 +26,5 @@ class AuthBookBackend(BaseBackend): } obj = AuthBook.objects.create(**kwargs) obj.set_auth(**auth_info) + obj.set_version_and_latest() return obj From c25335cf951f9f842a994a9d6d479706021d95f1 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 1 Nov 2019 14:52:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9authbook?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/backends/db.py | 1 - apps/assets/models/authbook.py | 4 ---- apps/assets/serializers/asset_user.py | 2 +- apps/assets/signals_handler.py | 8 +++++++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/assets/backends/db.py b/apps/assets/backends/db.py index f702060fb..40fa41444 100644 --- a/apps/assets/backends/db.py +++ b/apps/assets/backends/db.py @@ -26,5 +26,4 @@ class AuthBookBackend(BaseBackend): } obj = AuthBook.objects.create(**kwargs) obj.set_auth(**auth_info) - obj.set_version_and_latest() return obj diff --git a/apps/assets/models/authbook.py b/apps/assets/models/authbook.py index 991729250..0243b43fb 100644 --- a/apps/assets/models/authbook.py +++ b/apps/assets/models/authbook.py @@ -60,10 +60,6 @@ class AuthBook(AssetUser): self.version = 1 self.save() - def set_version_and_latest(self): - self.set_version() - self.set_to_latest() - def get_related_assets(self): return [self.asset] diff --git a/apps/assets/serializers/asset_user.py b/apps/assets/serializers/asset_user.py index 18b5ea982..1e05b8f5b 100644 --- a/apps/assets/serializers/asset_user.py +++ b/apps/assets/serializers/asset_user.py @@ -53,7 +53,7 @@ class AssetUserSerializer(AuthSerializerMixin, BulkOrgResourceModelSerializer): if not validated_data.get("name") and validated_data.get("username"): validated_data["name"] = validated_data["username"] instance = AssetUserManager.create(**validated_data) - instance.set_version_and_latest() + instance.set_to_latest() return instance diff --git a/apps/assets/signals_handler.py b/apps/assets/signals_handler.py index ea5f8f4ad..594da38b7 100644 --- a/apps/assets/signals_handler.py +++ b/apps/assets/signals_handler.py @@ -9,7 +9,7 @@ from django.dispatch import receiver from common.utils import get_logger, timeit from common.decorator import on_transaction_commit -from .models import Asset, SystemUser, Node +from .models import Asset, SystemUser, Node, AuthBook from .tasks import ( update_assets_hardware_info_util, test_asset_connectivity_util, @@ -189,3 +189,9 @@ def on_asset_nodes_remove(sender, instance=None, action='', model=None, def on_node_update_or_created(sender, **kwargs): # 刷新节点 Node.refresh_nodes() + + +@receiver(post_save, sender=AuthBook) +def on_authbook_created(sender, instance=None, created=True, **kwargs): + if created and instance: + instance.set_version()