admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2018-11-12 23:34:47 +00:00
parent f1fe285fd5
commit 9b5c4094b5
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/Startup.cs
View File

@@ -380,7 +380,7 @@ namespace AyaNova
// ******************** TESTING WIPE DB ***************************** // ******************** TESTING WIPE DB *****************************
// //
//Set this to true to wipe the db and reinstall a trial license and re-seed the data //Set this to true to wipe the db and reinstall a trial license and re-seed the data
var TESTING_REFRESH_DB = false;//############################################################################################# var TESTING_REFRESH_DB = true;//#############################################################################################
#if (DEBUG) #if (DEBUG)
//TESTING //TESTING

6
server/AyaNova/biz/LocaleBiz.cs
View File

@@ -354,8 +354,12 @@ namespace AyaNova.Biz
return v.First(); return v.First();
} }
public static long LocaleNameToIdStatic(string localeName, AyContext ct) public static long LocaleNameToIdStatic(string localeName, AyContext ct = null)
{ {
if (ct == null)
{
ct = ServiceProviderProvider.DBContext;
}
var v = ct.Locale.Where(c => c.Name == localeName).Select(x => x.Id); var v = ct.Locale.Where(c => c.Name == localeName).Select(x => x.Id);
if (v.Count() < 1) return ServerBootConfig.AYANOVA_DEFAULT_LANGUAGE_ID; if (v.Count() < 1) return ServerBootConfig.AYANOVA_DEFAULT_LANGUAGE_ID;
return v.First(); return v.First();

11
server/AyaNova/util/Seeder.cs
View File

@@ -330,6 +330,13 @@ namespace AyaNova.Util
//TEST NOT ACTIVE - this is used for a test to see if inactive user can login //TEST NOT ACTIVE - this is used for a test to see if inactive user can login
GenSeedUser(log, 1, AuthorizationRoles.OpsAdminLimited, UserType.NonSchedulable, false, "TEST_INACTIVE", "TEST_INACTIVE"); GenSeedUser(log, 1, AuthorizationRoles.OpsAdminLimited, UserType.NonSchedulable, false, "TEST_INACTIVE", "TEST_INACTIVE");
//Alternate locale users for each stock locale
GenSeedUser(log, 1, AuthorizationRoles.BizAdminFull, UserType.Administrator, true, "de", "de", LocaleBiz.LocaleNameToIdStatic("de"));
GenSeedUser(log, 1, AuthorizationRoles.BizAdminFull, UserType.Administrator, true, "es", "es", LocaleBiz.LocaleNameToIdStatic("es"));
GenSeedUser(log, 1, AuthorizationRoles.BizAdminFull, UserType.Administrator, true, "fr", "fr", LocaleBiz.LocaleNameToIdStatic("fr"));
} }
catch catch
{ {
@@ -364,7 +371,7 @@ namespace AyaNova.Util
public static void GenSeedUser(ILogger log, int count, AuthorizationRoles roles, UserType userType, bool active = true, string login = null, string password = null) public static void GenSeedUser(ILogger log, int count, AuthorizationRoles roles, UserType userType, bool active = true, string login = null, string password = null, long localeId = 0)
{ {
UserBiz Biz = UserBiz.GetBizInternal(ServiceProviderProvider.DBContext); UserBiz Biz = UserBiz.GetBizInternal(ServiceProviderProvider.DBContext);
@@ -392,7 +399,7 @@ namespace AyaNova.Util
else else
u.Password = u.Login; u.Password = u.Login;
u.Roles = roles; u.Roles = roles;
u.LocaleId = ServerBootConfig.AYANOVA_DEFAULT_LANGUAGE_ID; u.LocaleId = localeId == 0 ? ServerBootConfig.AYANOVA_DEFAULT_LANGUAGE_ID : localeId;
u.UserType = userType; u.UserType = userType;
//TODO: After have USER and HEADOFFICE and VENDOR, if usertype is subcontractor or client or headoffice it needs to set a corresponding user's parent org record id to go with it //TODO: After have USER and HEADOFFICE and VENDOR, if usertype is subcontractor or client or headoffice it needs to set a corresponding user's parent org record id to go with it