Fixing discrepencies in object manipulation.

This commit is contained in:
stephb9959
2021-10-25 11:17:49 -07:00
parent 20960ac00e
commit 547cee2eaa
13 changed files with 44 additions and 64 deletions

View File

@@ -130,10 +130,7 @@ namespace OpenWifi{
return BadRequest(RESTAPI::Errors::InvalidJSONDocument);
}
for(auto &i:NewObject.info.notes) {
i.createdBy = UserInfo_.userinfo.email;
Existing.info.notes.insert(Existing.info.notes.begin(),i);
}
UpdateObjectInfo(RawObject, UserInfo_.userinfo, Existing.info);
std::string MoveToPolicy, MoveFromPolicy;
bool MovingPolicy=false;
@@ -155,8 +152,6 @@ namespace OpenWifi{
MovingEntity = MoveToEntity != Existing.entity ;
}
AssignIfPresent(RawObject,"name",Existing.info.name);
AssignIfPresent(RawObject,"description",Existing.info.description);
AssignIfPresent(RawObject, "title", Existing.title);
AssignIfPresent(RawObject, "salutation", Existing.salutation);
AssignIfPresent(RawObject, "firstname", Existing.firstname);
@@ -174,7 +169,6 @@ namespace OpenWifi{
Existing.phones = NewObject.phones;
Existing.entity = MoveToEntity;
Existing.info.modified = std::time(nullptr);
Existing.managementPolicy = MoveToPolicy;
if(DB_.UpdateRecord("id", UUID, Existing)) {