tsanie/fleet-contractor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
Tsanie Lily
2023-04-28 12:21:24 +08:00
parent 156d145a48
commit 88e0a25ecd
162 changed files with 26324 additions and 7519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
IronIntelContractorBusiness/Host/Common.cs
View File

@ -1,4 +1,5 @@
using System;
using IronIntel.Contractor.iisitebase;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Linq;
@ -21,7 +22,7 @@ namespace IronIntel.Contractor
{
if (_LoginSessionCookieName == null)
{
_LoginSessionCookieName = Site.IronIntelBasePage.LOGINSESSION_COOKIENAME;
_LoginSessionCookieName = IronIntelBasePage.LOGINSESSION_COOKIENAME;
}
return _LoginSessionCookieName;
}
@ -34,7 +35,7 @@ namespace IronIntel.Contractor
{
if (_LanguageCookieName == null)
{
_LanguageCookieName = LoginSessionCookieName + "language";
_LanguageCookieName = IronIntelBasePage.LANGUAGE_COOKIENAME;
}
return _LanguageCookieName;
}

16
IronIntelContractorBusiness/Host/HostService.cs
View File

@ -72,7 +72,7 @@ namespace IronIntel.Contractor
catch (Exception ex)
{
SystemParams.WriteLog("ERROR", "DeleteUserGroup", ex.Message, ex.ToString());
throw new Exception(ResManager.GetLanguage("LHBIS_EXCEPTION_E0X6502704C")); // "Failed to delete the user group."
throw new Exception(ResManager.GetLanguage(ClientLanguage, "LHBIS_EXCEPTION_E0X6502704C")); // "Failed to delete the user group."
}
return null;
}
@ -176,7 +176,7 @@ namespace IronIntel.Contractor
if (flag)
{
SystemParams.WriteLog("ERROR", "SaveUser", "user try to edit user with illegal permission.", string.Format("current user: {0}, {1}", CurrentUserIID, CurrentUserName));
return ResManager.GetLanguage("ERROR_LHBIS_FIC_BLC_BLWORKSPACE_A0034"); // "The user does not have the required access rights.";
return ResManager.GetLanguage(ClientLanguage, "ERROR_LHBIS_FIC_BLC_BLWORKSPACE_A0034"); // "The user does not have the required access rights.";
}
return null;
}
@ -217,19 +217,19 @@ namespace IronIntel.Contractor
if (string.IsNullOrWhiteSpace(user.ID))
{
return ResManager.GetLanguage("LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A023"); // "User ID cannot be empty.";
return ResManager.GetLanguage(ClientLanguage, "LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A023"); // "User ID cannot be empty.";
}
if (!reg_email.Match(user.ID).Success && !reg_userid.Match(user.ID).Success)
{
return ResManager.GetLanguage("LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A056"); // "The user ID must contain only letters, numbers, underlines, minus signs or an email address.";
return ResManager.GetLanguage(ClientLanguage, "LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A056"); // "The user ID must contain only letters, numbers, underlines, minus signs or an email address.";
}
if (string.IsNullOrWhiteSpace(user.DisplayName))
{
return ResManager.GetLanguage("LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A024"); // "User name cannot be empty.";
return ResManager.GetLanguage(ClientLanguage, "LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A024"); // "User name cannot be empty.";
}
if (!string.IsNullOrWhiteSpace(user.Email) && !reg_email.Match(user.Email).Success)
{
return ResManager.GetLanguage("LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A066"); // "Email address is invalid.";
return ResManager.GetLanguage(ClientLanguage, "LHBIS_FIC_CLIENT_MODULES_USERMANAGERCTRL_A066"); // "Email address is invalid.";
}
user.ID = user.ID.Trim();
if (user.ID.Length > 100)
@ -400,7 +400,7 @@ namespace IronIntel.Contractor
}
if (string.IsNullOrWhiteSpace(group.Name))
{
return ResManager.GetLanguage("LHBIS_FIC_CLIENT_MODULES_USERADDDIALOG_A004"); // "Group name cannot be empty.";
return ResManager.GetLanguage(ClientLanguage, "LHBIS_FIC_CLIENT_MODULES_USERADDDIALOG_A004"); // "Group name cannot be empty.";
}
// users
@ -511,7 +511,7 @@ namespace IronIntel.Contractor
public UserPermissionData[] GetUserOrGroupPermission(string UserOrGroup, string objIID)
{
return UserManagement.GetUserOrGroupPermission(UserOrGroup, objIID, CurrentUserIID);
return UserManagement.GetUserOrGroupPermission(UserOrGroup, objIID, CurrentUserIID, ClientLanguage);
}
#region - System Options -