Merge branch 'tmp_org' into org

apps/assets/models/asset.py

@@ -161,6 +161,12 @@ class Asset(OrgModelMixin):
             nodes = list(reduce(lambda x, y: set(x) | set(y), nodes))
         return nodes
 
+    @property
+    def org_name(self):
+        from orgs.models import Organization
+        org = Organization.get_instance(self.org_id)
+        return org.name
+
     @property
     def hardware_info(self):
         if self.cpu_count:

apps/assets/serializers/asset.py

@@ -25,7 +25,7 @@ class AssetSerializer(BulkSerializerMixin, serializers.ModelSerializer):
     def get_field_names(self, declared_fields, info):
         fields = super().get_field_names(declared_fields, info)
         fields.extend([
-            'hardware_info', 'is_connective',
+            'hardware_info', 'is_connective', 'org_name'
         ])
         return fields
 
@@ -43,7 +43,7 @@ class AssetGrantedSerializer(serializers.ModelSerializer):
         fields = (
             "id", "hostname", "ip", "port", "system_users_granted",
             "is_active", "system_users_join", "os", 'domain',
-            "platform", "comment", "protocol", "org_id",
+            "platform", "comment", "protocol", "org_id", "org_name",
         )
 
     @staticmethod
@@ -61,6 +61,6 @@ class MyAssetGrantedSerializer(AssetGrantedSerializer):
         model = Asset
         fields = (
             "id", "hostname", "system_users_granted",
-            "is_active", "system_users_join",
+            "is_active", "system_users_join", "org_name",
-            "os", "platform", "comment",
+            "os", "platform", "comment", "org_id", "protocol"
         )