From 215e90aa4b7e904d0544b2c6fc04f16d43bbafd7 Mon Sep 17 00:00:00 2001
From: guangyuzhang <13621160019@163.com>
Date: Mon, 1 Mar 2021 22:17:50 +0800
Subject: [PATCH 1/2] deleted require property for space contact in admin

---
 admin/views/settings/space/space.model.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/views/settings/space/space.model.html b/admin/views/settings/space/space.model.html
index a698c8d4..007eb02d 100644
--- a/admin/views/settings/space/space.model.html
+++ b/admin/views/settings/space/space.model.html
@@ -30,7 +30,7 @@
             <div class="hr-line-dashed"></div>
             <div class="form-group"><label class="col-sm-4 control-label">{{'SETTING.CONTACT' | translate}}</label>
                 <div class="col-sm-8">
-                    <ui-select ng-model="space.contact.id" name="spacecontact" theme="bootstrap" required>
+                    <ui-select ng-model="space.contact.id" name="spacecontact" theme="bootstrap">
                         <ui-select-match allow-clear="false" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">
                             {{$select.selected.name}}</ui-select-match>
                         <ui-select-choices repeat="contact.id as contact in contacts | filter: $select.search">

From ce7553afcb81bf9eade7001675b68070c037e354 Mon Sep 17 00:00:00 2001
From: guangyuzhang <13621160019@163.com>
Date: Mon, 1 Mar 2021 22:38:20 +0800
Subject: [PATCH 2/2] fixed null contact issue in space controller in admin

---
 admin/app/controllers/settings/space/space.controller.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/admin/app/controllers/settings/space/space.controller.js b/admin/app/controllers/settings/space/space.controller.js
index c583ce99..7f64b949 100644
--- a/admin/app/controllers/settings/space/space.controller.js
+++ b/admin/app/controllers/settings/space/space.controller.js
@@ -207,7 +207,10 @@ app.controller('SpaceController', function ($scope, $common, $uibModal, SpaceSer
 				modifiedSpace.parent_space_id = null;
 			}
 			modifiedSpace.timezone_id = modifiedSpace.timezone.id;
-			modifiedSpace.contact_id = modifiedSpace.contact.id;
+			if (modifiedSpace.contact != null) {
+				modifiedSpace.contact_id = modifiedSpace.contact.id;
+			}
+			 
 			modifiedSpace.cost_center_id = modifiedSpace.cost_center.id;
 			SpaceService.editSpace(modifiedSpace, function (error, status) {
 				if (angular.isDefined(status) && status == 200) {