Skip to content

Commit b8047df

Browse files
WillStrohlWillStrohl
authored
Merge pull request #110 from UpendoVentures/tasks/release-1.5.0
Tasks/release 1.5.0
2 parents 2607b8f + bcfaebc commit b8047df

File tree

11 files changed

+94
-49
lines changed

11 files changed

+94
-49
lines changed

‎Modules/UserManager/App_LocalResources/Impersonate.resx

+9-3
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,21 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<data name="AreYouSure.Text" xml:space="preserve">
121-
<value>Are you sure you want to perform this action?</value>
121+
<value>Are you sure you want to impersonate this user account?</value>
122+
</data>
123+
<data name="DeleteUser.Text" xml:space="preserve">
124+
<value>Delete User Account</value>
122125
</data>
123126
<data name="Impersonate.Text" xml:space="preserve">
124127
<value>Impersonate</value>
125128
</data>
126129
<data name="ImpersonateAnotherUserAccountConfirmation.Text" xml:space="preserve">
127-
<value>You are about to impersonate another user account. If you confirm, he website will attempt to log you in as if they logged in themselves. You will need to logout and log back in to restore your superuser access. If you cancel, nothing will happen.</value>
130+
<value>You are about to impersonate another user account. &lt;b&gt;If you confirm&lt;/b&gt;, the website will attempt to log you in as if the user themselves logged in. You will need to logout and log back in to restore your superuser access. &lt;b&gt;If you cancel&lt;/b&gt;, nothing will happen.</value>
128131
</data>
129132
<data name="ImpersonateAnotherUserAccountConfirmationAlert.Text" xml:space="preserve">
130-
<value>Technical Limitation: If you are using another authentication provider other than the built-in DNN provider, this feature may or may not work, depending on the type of authentication you have installed/enabled.</value>
133+
<value>&lt;b&gt;Technical Limitation:&lt;/b&gt; If you are using another authentication provider other than the built-in DNN provider, this feature may or may not work, depending on the type of authentication you have installed/enabled.</value>
134+
</data>
135+
<data name="ImpersonateUser.Text" xml:space="preserve">
136+
<value>Impersonate User Account</value>
131137
</data>
132138
</root>

‎Modules/UserManager/App_LocalResources/Index.resx

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
<value>Create User</value>
128128
</data>
129129
<data name="BulkDeleteUser.Text" xml:space="preserve">
130-
<value>Bulk Delete User</value>
130+
<value>Bulk Delete Users</value>
131131
</data>
132132
<data name="CreateRole.Text" xml:space="preserve">
133133
<value>Create Role</value>
@@ -187,7 +187,7 @@
187187
<value>Username</value>
188188
</data>
189189
<data name="UserRoles.Text" xml:space="preserve">
190-
<value>User Roles</value>
190+
<value>User's Roles</value>
191191
</data>
192192
<data name="Users.Text" xml:space="preserve">
193193
<value>USERS</value>

‎Modules/UserManager/Module.css

+5
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,11 @@
321321
margin-bottom: 25px;
322322
}
323323

324+
.mtb-2 {
325+
margin-top: 0.5em;
326+
margin-bottom: 0.5em;
327+
}
328+
324329
.pb10 {
325330
padding-bottom: 10px !important;
326331
}

‎Modules/UserManager/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
// Build Number
3030
// Revision
3131
//
32-
[assembly: AssemblyVersion("01.04.01")]
33-
[assembly: AssemblyFileVersion("01.04.01")]
32+
[assembly: AssemblyVersion("01.05.00")]
33+
[assembly: AssemblyFileVersion("01.05.00")]

‎Modules/UserManager/Providers/DataProviders/SqlDataProvider/01.04.01.SqlDataProvider ‎Modules/UserManager/Providers/DataProviders/SqlDataProvider/01.05.00.SqlDataProvider

File renamed without changes.

‎Modules/UserManager/Upendo.Modules.UserManager.csproj

+2-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<AppDesignerFolder>Properties</AppDesignerFolder>
1414
<RootNamespace>Upendo.Modules.UserManager</RootNamespace>
1515
<AssemblyName>Upendo.Modules.UserManager</AssemblyName>
16-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1717
<UseIISExpress>false</UseIISExpress>
1818
<IISExpressSSLPort />
1919
<IISExpressAnonymousAuthentication />
@@ -75,10 +75,6 @@
7575
<Reference Include="System.ComponentModel.DataAnnotations" />
7676
<Reference Include="System" />
7777
<Reference Include="System.Data" />
78-
<Reference Include="System.Core" />
79-
<Reference Include="System.Data.DataSetExtensions" />
80-
<Reference Include="System.Web.Extensions" />
81-
<Reference Include="System.Xml.Linq" />
8278
<Reference Include="System.Drawing" />
8379
<Reference Include="System.Web" />
8480
<Reference Include="System.Web.Http">
@@ -176,7 +172,7 @@
176172
<Content Include="Providers\DataProviders\SqlDataProvider\01.01.01.SqlDataProvider" />
177173
<Content Include="Providers\DataProviders\SqlDataProvider\Uninstall.SqlDataProvider" />
178174
<Content Include="Views\UserManage\BulkDelete.cshtml" />
179-
<Content Include="Providers\DataProviders\SqlDataProvider\01.04.01.SqlDataProvider" />
175+
<Content Include="Providers\DataProviders\SqlDataProvider\01.05.00.SqlDataProvider" />
180176
</ItemGroup>
181177
<ItemGroup>
182178
<Content Include="App_LocalResources\RolesManageController.resx" />

‎Modules/UserManager/Upendo.UserManager.dnn

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<dotnetnuke type="Package" version="6.0">
33
<packages>
4-
<package name="Upendo.Modules.UserManager" type="Module" version="01.04.01">
4+
<package name="Upendo.Modules.UserManager" type="Module" version="01.05.00">
55
<friendlyName>Upendo DNN User Manager</friendlyName>
66
<description><![CDATA[<p>The Upendo DNN User Manager empowers authorized end-users in your DNN website to be able to manage user accounts and their assigned security roles.</p>]]></description>
77
<iconFile>DesktopModules/MVC/Upendo.Modules.UserManager/Images/logo.png</iconFile>
@@ -60,7 +60,7 @@
6060
<attributes>
6161
<businessControllerClass>Upendo.Modules.UserManager.Components.UserManagerController, Upendo.Modules.UserManager</businessControllerClass>
6262
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
63-
<upgradeVersionsList>01.00.00,01.01.00,01.01.01,01.02.00,01.03.00,01.04.00,01.04.01</upgradeVersionsList>
63+
<upgradeVersionsList>01.00.00,01.01.00,01.01.01,01.02.00,01.03.00,01.04.00,01.04.01,01.05.00</upgradeVersionsList>
6464
</attributes>
6565
</eventMessage>
6666
</component>
@@ -69,7 +69,7 @@
6969
<assembly>
7070
<name>Upendo.Modules.UserManager.dll</name>
7171
<path>bin</path>
72-
<version>01.04.01</version>
72+
<version>01.05.00</version>
7373
</assembly>
7474
</assemblies>
7575
</component>
@@ -91,13 +91,13 @@
9191
</script>
9292
<script type="Install">
9393
<path>Providers\DataProviders\SqlDataProvider</path>
94-
<name>01.04.01.SqlDataProvider</name>
95-
<version>01.04.01</version>
94+
<name>01.05.00.SqlDataProvider</name>
95+
<version>01.05.00</version>
9696
</script>
9797
<script type="UnInstall">
9898
<path>Providers\DataProviders\SqlDataProvider</path>
9999
<name>Uninstall.SqlDataProvider</name>
100-
<version>01.04.01</version>
100+
<version>01.05.01</version>
101101
</script>
102102
</scripts>
103103
</component>

‎Modules/UserManager/Upendo.UserManager_Symbols.dnn

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<dotnetnuke type="Package" version="6.0">
33
<packages>
4-
<package name="Upendo.Modules.UserManager_Symbols" type="Library" version="01.04.01">
4+
<package name="Upendo.Modules.UserManager_Symbols" type="Library" version="01.05.00">
55
<friendlyName>Upendo DNN User Manager Symbols</friendlyName>
66
<description><![CDATA[Upendo DNN User Manager Extension for DNN]]></description>
77
<owner>
@@ -14,7 +14,7 @@
1414
<releaseNotes src="ReleaseNotes.txt" />
1515
<azureCompatible>True</azureCompatible>
1616
<dependencies>
17-
<dependency type="managedPackage" version="1.4.1">Upendo.Modules.UserManager</dependency>
17+
<dependency type="managedPackage" version="1.5.0">Upendo.Modules.UserManager</dependency>
1818
</dependencies>
1919
<components>
2020
<component type="ResourceFile">

‎Modules/UserManager/Views/UserManage/Index.cshtml

+8-5
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,11 @@
2626
<nav class="navbar navbar-default" role="navigation">
2727
<div class="col-md2">
2828
<a type="button" class="AM-btn AM-btn-primary" href="@Url.Action("Create", "UserManage", new {ctl = "Edit"})">
29+
<span class="fa fa-plus color-white" aria-hidden="true"></span>
2930
@Localization.GetString("BtnCreateUser", @ResourceFile)
3031
</a>
3132
</div>
32-
<div class="col-md10 AM-d-flex AM-justify-content-end">
33+
<div class="col-md10 AM-d-flex AM-justify-content-end mtb-2">
3334
<span id="dialogs-DeleteUnauthorized mr5" class="dnnActions mr5" style="display: initial;">
3435
<a type="button" class="confirm AM-btn AM-btn-danger" href="@Url.Action("DeleteUnauthorizedUsers", "UserManage", new {})" style="color: white;">
3536
<span class="fa fa-trash color-white" aria-hidden="true"></span>
@@ -214,14 +215,16 @@
214215
<span class="fa fa-tasks color-white" aria-hidden="true"></span>
215216
</a>
216217
<span id="dialogs-delete" class="dnnActions" style="display: initial;">
217-
<a data-hint="Delete" class="confirm AM-btn AM-btn-danger AM-btn-sm delete" data-placement="top" data-singleton="true" href="@Url.Action("Delete", "UserManage", new {itemId = item.UserId})">
218+
<a data-hint="Delete" class="confirm AM-btn AM-btn-danger AM-btn-sm delete" data-placement="top" data-singleton="true" href="@Url.Action("Delete", "UserManage", new {itemId = item.UserId})"
219+
data-toggle="tooltip" data-placement="top" title="@Localization.GetString("DeleteUser", @ResourceFile)">
218220
<span class="fa fa-trash color-white" aria-hidden="true"></span>
219221
</a>
220222
</span>
221223
@if (ViewBag.IsCurrentUserSuperUser)
222224
{
223225
<span id="dialogs-impersonate" class="dnnActions" style="display: initial;">
224-
<a data-hint="Delete" class="confirm AM-btn AM-btn-primary AM-btn-sm" data-placement="top" data-singleton="true" href="@Url.Action("ImpersonateUserById", "UserManage", new {itemId = item.UserId})">
226+
<a data-hint="Delete" class="confirm AM-btn AM-btn-primary AM-btn-sm" data-placement="top" data-singleton="true" href="@Url.Action("ImpersonateUserById", "UserManage", new {itemId = item.UserId})"
227+
data-toggle="tooltip" data-placement="top" title="@Localization.GetString("ImpersonateUser", @ResourceFile)">
225228
<span class="fas fa-eye color-white" aria-hidden="true"></span>
226229
</a>
227230
</span>
@@ -258,8 +261,8 @@
258261
var deleteUnauthorizedText = '@DotNetNuke.Services.Localization.Localization.GetString("DeleteUnauthorized.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Index.resx")';
259262
var removeDeleteText = '@DotNetNuke.Services.Localization.Localization.GetString("RemoveDelete.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Index.resx")';
260263
var impersonateText = '@DotNetNuke.Services.Localization.Localization.GetString("Impersonate.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx")';
261-
var impersonateAnotherUserAccountConfirmation = '@DotNetNuke.Services.Localization.Localization.GetString("ImpersonateAnotherUserAccountConfirmation.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx")';
262-
var impersonateAnotherUserAccountConfirmationAlert = '@DotNetNuke.Services.Localization.Localization.GetString("ImpersonateAnotherUserAccountConfirmationAlert.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx")';
264+
var impersonateAnotherUserAccountConfirmation = '@Html.Raw(DotNetNuke.Services.Localization.Localization.GetString("ImpersonateAnotherUserAccountConfirmation.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx"))';
265+
var impersonateAnotherUserAccountConfirmationAlert = '@Html.Raw(DotNetNuke.Services.Localization.Localization.GetString("ImpersonateAnotherUserAccountConfirmationAlert.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx"))';
263266
var areYouSure = '@DotNetNuke.Services.Localization.Localization.GetString("AreYouSure.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx")';
264267
var cancel = '@DotNetNuke.Services.Localization.Localization.GetString("Cancel.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Shared.resx")';
265268
var deleteBtnText = '@DotNetNuke.Services.Localization.Localization.GetString("Delete.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Shared.resx")';

‎Modules/UserManager/releasenotes.txt

+24
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,30 @@
3333
<li><strong>SI:</strong> Support Inquiry - This issue was reported by a <a href="https://upendoventures.com/Support" target="_blank">support customer</a> and, as such, was prioritized above all other tasks.</li>
3434
</ul>
3535

36+
<h2>Release Notes: 01.05.00</h2>
37+
38+
<h3><strong>Enhancements</strong></h3>
39+
<ul>
40+
<li><strong>Impersonation</strong> - Superusers can now impersonate other user accounts on the site. (<a href="https://github.com/UpendoVentures/Upendo-Dnn-UserManager/issues/59" target="_blank">Issue 59</a>), Thanks <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a></li>
41+
<!--
42+
<li><strong></strong> - . (<a href="https://github.com/UpendoVentures/Upendo-Dnn-UserManager/issues/" target="_blank">Issue </a>), Thanks <a href="https://github.com/" target="_blank">@</a></li>
43+
<li>None at this time.</li>
44+
-->
45+
</ul>
46+
47+
<h3><strong>Maintenance Updates &amp; Bug Fixes</strong></h3>
48+
<ul>
49+
<li><a href="https://github.com/UpendoVentures/Upendo-Dnn-UserManager/issues/80" target="_blank">Issue 80</a> - SI: Search Should Not be Case-Sensitive. Thanks <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a></li>
50+
<li><a href="https://github.com/UpendoVentures/Upendo-Dnn-UserManager/issues/86" target="_blank">Issue 86</a> - Resolved an Exception from Changing a Username. Thanks <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</a></li>
51+
<li>(no issue) - Now Compiles Against .NET 4.8. Thanks, <a href="https://github.com/WillStrohl" target="_blank">@WillStrohl</a>!</li>
52+
<!--
53+
<li><a href="https://github.com/UpendoVentures/Upendo-Dnn-UserManager/issues/" target="_blank">Issue </a> - . Thanks <a href="https://github.com/" target="_blank">@</a></li>
54+
<li>(no issue) - .</li>
55+
<li>None at this time.</li>
56+
-->
57+
</ul>
58+
<hr />
59+
3660
<h2>Release Notes: 01.04.01</h2>
3761

3862
<h3><strong>Enhancements</strong></h3>

‎Modules/UserManager/web.config

+34-23
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,35 @@
1-
<?xml version="1.0"?>
2-
<configuration>
3-
<configSections>
4-
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor">
5-
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor" requirePermission="false" />
6-
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor" requirePermission="false" />
7-
</sectionGroup>
8-
</configSections>
9-
<system.web.webPages.razor>
10-
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc"/>
11-
<pages pageBaseType="DotNetNuke.Web.Mvc.Framework.DnnWebViewPage">
12-
<namespaces>
13-
<add namespace="System.Linq"/>
14-
<add namespace="System.Web.Helpers" />
15-
<add namespace="System.Web.Mvc" />
16-
<add namespace="System.Web.Mvc.Ajax" />
17-
<add namespace="System.Web.Mvc.Html" />
18-
<add namespace="System.Web.Routing" />
19-
<add namespace="System.Web.WebPages" />
20-
<add namespace="DotNetNuke.Web.Mvc.Helpers"/>
21-
</namespaces>
22-
</pages>
23-
</system.web.webPages.razor>
1+
<?xml version="1.0"?>
2+
<configuration>
3+
<configSections>
4+
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor">
5+
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor" requirePermission="false"/>
6+
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor" requirePermission="false"/>
7+
</sectionGroup>
8+
</configSections>
9+
<system.web.webPages.razor>
10+
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc"/>
11+
<pages pageBaseType="DotNetNuke.Web.Mvc.Framework.DnnWebViewPage">
12+
<namespaces>
13+
<add namespace="System.Linq"/>
14+
<add namespace="System.Web.Helpers"/>
15+
<add namespace="System.Web.Mvc"/>
16+
<add namespace="System.Web.Mvc.Ajax"/>
17+
<add namespace="System.Web.Mvc.Html"/>
18+
<add namespace="System.Web.Routing"/>
19+
<add namespace="System.Web.WebPages"/>
20+
<add namespace="DotNetNuke.Web.Mvc.Helpers"/>
21+
</namespaces>
22+
</pages>
23+
</system.web.webPages.razor>
24+
<!--
25+
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
26+
27+
The following attributes can be set on the <httpRuntime> tag.
28+
<system.Web>
29+
<httpRuntime targetFramework="4.8" />
30+
</system.Web>
31+
-->
32+
<system.web>
33+
<compilation targetFramework="4.8"/>
34+
</system.web>
2435
</configuration>

0 commit comments

Comments
 (0)