From 05a5e9cc69a683a5f0973f7f4df959768a1cf296 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 2 Nov 2016 19:44:11 +0800
Subject: [PATCH] Finish some bug

---
 apps/assets/api.py                             | 11 +++++++++--
 apps/assets/forms.py                           |  2 +-
 apps/assets/templates/assets/asset_create.html |  1 -
 apps/assets/templates/assets/asset_update.html |  1 -
 apps/assets/views.py                           |  2 --
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/assets/api.py b/apps/assets/api.py
index f57e1d7ba..4e30ddbf6 100644
--- a/apps/assets/api.py
+++ b/apps/assets/api.py
@@ -73,8 +73,15 @@ class SystemUserAuthApi(APIView):
         system_user = get_object_or_none(SystemUser, id=system_user_id, username=system_user_username)
 
         if system_user:
-            password = signer.sign(system_user.password)
-            private_key = signer.sign(system_user.private_key)
+            if system_user.password:
+                password = signer.sign(system_user.password)
+            else:
+                password = signer.sign('')
+
+            if system_user.private_key:
+                private_key = signer.sign(system_user.private_key)
+            else:
+                private_key = signer.sign(None)
 
             response = {
                 'id': system_user.id,
diff --git a/apps/assets/forms.py b/apps/assets/forms.py
index 7b8c6ceba..35c8a1258 100644
--- a/apps/assets/forms.py
+++ b/apps/assets/forms.py
@@ -242,7 +242,7 @@ class SystemUserForm(forms.ModelForm):
         # Todo: Validate private key file, and generate public key
         # Todo: Auto generate private key and public key
         if private_key_file:
-            system_user.private_key = private_key_file.read()
+            system_user.private_key = private_key_file.read().strip()
         system_user.save()
         return self.instance
 
diff --git a/apps/assets/templates/assets/asset_create.html b/apps/assets/templates/assets/asset_create.html
index e49540738..b00f9c8df 100644
--- a/apps/assets/templates/assets/asset_create.html
+++ b/apps/assets/templates/assets/asset_create.html
@@ -20,7 +20,6 @@
     <div class="hr-line-dashed"></div>
     <h3>{% trans 'Asset user' %}</h3>
     {{ form.admin_user|bootstrap_horizontal }}
-    {{ form.system_users|bootstrap_horizontal }}
 
     <div class="hr-line-dashed"></div>
     <h3>{% trans 'Other' %}</h3>
diff --git a/apps/assets/templates/assets/asset_update.html b/apps/assets/templates/assets/asset_update.html
index fb46c79d0..bd9f7bde8 100644
--- a/apps/assets/templates/assets/asset_update.html
+++ b/apps/assets/templates/assets/asset_update.html
@@ -25,7 +25,6 @@
     <div class="hr-line-dashed"></div>
     <h3>{% trans 'Asset user' %}</h3>
     {{ form.admin_user|bootstrap_horizontal }}
-    {{ form.system_users|bootstrap_horizontal }}
 
     <div class="hr-line-dashed"></div>
     <h3>{% trans 'Hardware' %}</h3>
diff --git a/apps/assets/views.py b/apps/assets/views.py
index c7bfbf9b3..f146e0e5a 100644
--- a/apps/assets/views.py
+++ b/apps/assets/views.py
@@ -46,8 +46,6 @@ class AssetListView(AdminUserRequiredMixin, ListView):
         return super(AssetListView, self).get_context_data(**kwargs)
 
 
-
-
 class AssetCreateView(AdminUserRequiredMixin,CreateAssetTagsMiXin,CreateView):
     model = Asset
     tag_type = 'asset'