diff --git a/.vscode/launch.json b/.vscode/launch.json index 8fd97968..0e2049e9 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs index c876605a..14045d08 100644 --- a/server/AyaNova/biz/UserBiz.cs +++ b/server/AyaNova/biz/UserBiz.cs @@ -504,7 +504,7 @@ namespace AyaNova.Biz //no need to rollback, the transaction will rollback automatically if it's disposed without committing throw; } - //Note: Transaction does not need to be disposed it will automatically when it goes out of scope due to Using statement + //Note: Transaction does not need to be disposed it will automatically when it goes out of scope due to Using statement return true; } @@ -526,7 +526,7 @@ namespace AyaNova.Biz //UserType change has Inside / Outside role implications //a user attempting to change a UserType between inside or outside status must have the correct rights //to *BOTH* Customer and User since it's affecting both types - if (currentObj.IsOutsideUser != proposedObj.IsOutsideUser) + if (!isNew && (currentObj.IsOutsideUser != proposedObj.IsOutsideUser)) { //only can change if have both rights if (