andy/Saxonite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

v1.1.3.0

Browse Source
This commit is contained in:
andy
2021-07-23 14:01:49 +01:00
parent 10907d3aff
commit 0d7be69e1e
109 changed files with 3161 additions and 943 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaxoniteStandardBase/Base/Mgr/SaxAccountMgr-UserOrganisation.cs
+18 -1
View File
@@ -53,7 +53,7 @@ namespace Saxonite.Net.Standard.Base.Mgr
prmUserOrganisation.StatusCat = statusCat;
using (SaxUserOrganisation userOrganisation = GetUserOrganisation(prmUserOrganisation))
if (userOrganisation != null)
organisationRoles = userOrganisation.OrganisationRoles;
organisationRoles = userOrganisation.GetOrganisationRoles().ToList();
return organisationRoles;
}
@@ -85,6 +85,16 @@ namespace Saxonite.Net.Standard.Base.Mgr
prmUserOrganisation.StatusCat = SaxUserOrganisation.StatusCat.Any;
return GetUserOrganisation(prmUserOrganisation);
}
public SaxUserOrganisation GetUserOrganisationByUserOrganisation(SysId userAccountId, SysId organisationId)
{
ClearErrorState();
if (!SysId.IsValid(userAccountId) || !SysId.IsValid(organisationId)) return null;
SaxUserOrganisation.Params prmUserOrganisation = new SaxUserOrganisation.Params();
prmUserOrganisation.UserAccountIdsIncluded.Add(userAccountId);
prmUserOrganisation.OrganisationIdsIncluded.Add(organisationId);
prmUserOrganisation.StatusCat = SaxUserOrganisation.StatusCat.Any;
return GetUserOrganisation(prmUserOrganisation);
}
//-------------------------------------------------------------------
// Validate item data.
@@ -112,6 +122,13 @@ namespace Saxonite.Net.Standard.Base.Mgr
return SetErrorState("Organisation Id must be specified");
}
// Admin comment.
if (errField.AdminComment != SacsHierarchyItem.ValidValue.Ignore && !IsValidValue(data.AdminComment, "comment", (long)SaxDbDfn_Core.GetColTextLen(SaxDbDfn_Core.ColumnIdx.UserOrganisation_AdminComment)))
{
errField.AdminComment = SacsHierarchyItem.ValidValue.Invalid;
return false;
}
//---------------------------------------------------------------
// Common properties.
if (errField.Notes != SacsHierarchyItem.ValidValue.Ignore && !IsValidValue(data.Notes, "notes", (long)SaxDbDfn_Core.GetColTextLen(SaxDbDfn_Core.ColumnIdx.UserOrganisation_Notes)))