Skip to content

Commit

Permalink
Version 1.2.6:
Browse files Browse the repository at this point in the history
Fixed an issue with Import for existing users
  • Loading branch information
fordnn committed Apr 21, 2021
1 parent 705cff3 commit 863781e
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
Binary file modified .vs/UsersExportImport/v14/.suo
Binary file not shown.
7 changes: 6 additions & 1 deletion Components/CommonController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,12 @@ public static string DoImport(PortalSettings objPortalSettings, string LocalReso
if (UpdateExistingUser)
{
objUser = UserController.GetUserByName(objPortalSettings.PortalId, objUser.Username);
if (objUser != null)
if (objUser == null)
{
objUser = new DotNetNuke.Entities.Users.UserInfo();
objUser.Username = string.Format("{0}", GetDataRowValue(dt, dr, "Username", objUser.Email));
}
else
{
UserAlreadyExists = true;
}
Expand Down
5 changes: 4 additions & 1 deletion Install/_UsersExportImport.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="forDNN.UsersExportImport" type="Module" version="1.2.5">
<package name="forDNN.UsersExportImport" type="Module" version="1.2.6">
<friendlyName>forDNN.UsersExportImport</friendlyName>
<description>This module allows to export/import users, user profiles properties and roles to DNN (former DotNetNuke) from CSV/XML files. This is simple and fast way to create your users accounts in one click.</description>
<owner>
Expand All @@ -25,6 +25,9 @@
</license>
<releaseNotes>
<![CDATA[
<b>Version 1.2.6:</b><br />
Fixed an issue with Import for existing users<br />

<b>Version 1.2.5:</b><br />
Added support for DNN 9.8.1<br />
New feature "Export Users By Role"<br />
Expand Down
2 changes: 1 addition & 1 deletion Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.2.5.*")]
[assembly: AssemblyVersion("1.2.6.*")]

0 comments on commit 863781e

Please sign in to comment.