Skip to content

Commit

Permalink
Merge pull request #110 from UpendoVentures/tasks/release-1.5.0
Browse files Browse the repository at this point in the history
Tasks/release 1.5.0
  • Loading branch information
WillStrohl authored Dec 12, 2024
2 parents 2607b8f + bcfaebc commit b8047df
Show file tree
Hide file tree
Showing 11 changed files with 94 additions and 49 deletions.
12 changes: 9 additions & 3 deletions Modules/UserManager/App_LocalResources/Impersonate.resx
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,21 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AreYouSure.Text" xml:space="preserve">
<value>Are you sure you want to perform this action?</value>
<value>Are you sure you want to impersonate this user account?</value>
</data>
<data name="DeleteUser.Text" xml:space="preserve">
<value>Delete User Account</value>
</data>
<data name="Impersonate.Text" xml:space="preserve">
<value>Impersonate</value>
</data>
<data name="ImpersonateAnotherUserAccountConfirmation.Text" xml:space="preserve">
<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>
<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>
</data>
<data name="ImpersonateAnotherUserAccountConfirmationAlert.Text" xml:space="preserve">
<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>
<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>
</data>
<data name="ImpersonateUser.Text" xml:space="preserve">
<value>Impersonate User Account</value>
</data>
</root>
4 changes: 2 additions & 2 deletions Modules/UserManager/App_LocalResources/Index.resx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
<value>Create User</value>
</data>
<data name="BulkDeleteUser.Text" xml:space="preserve">
<value>Bulk Delete User</value>
<value>Bulk Delete Users</value>
</data>
<data name="CreateRole.Text" xml:space="preserve">
<value>Create Role</value>
Expand Down Expand Up @@ -187,7 +187,7 @@
<value>Username</value>
</data>
<data name="UserRoles.Text" xml:space="preserve">
<value>User Roles</value>
<value>User's Roles</value>
</data>
<data name="Users.Text" xml:space="preserve">
<value>USERS</value>
Expand Down
5 changes: 5 additions & 0 deletions Modules/UserManager/Module.css
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,11 @@
margin-bottom: 25px;
}

.mtb-2 {
margin-top: 0.5em;
margin-bottom: 0.5em;
}

.pb10 {
padding-bottom: 10px !important;
}
Expand Down
4 changes: 2 additions & 2 deletions Modules/UserManager/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("01.04.01")]
[assembly: AssemblyFileVersion("01.04.01")]
[assembly: AssemblyVersion("01.05.00")]
[assembly: AssemblyFileVersion("01.05.00")]
8 changes: 2 additions & 6 deletions Modules/UserManager/Upendo.Modules.UserManager.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Upendo.Modules.UserManager</RootNamespace>
<AssemblyName>Upendo.Modules.UserManager</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<UseIISExpress>false</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
Expand Down Expand Up @@ -75,10 +75,6 @@
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Http">
Expand Down Expand Up @@ -176,7 +172,7 @@
<Content Include="Providers\DataProviders\SqlDataProvider\01.01.01.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\Uninstall.SqlDataProvider" />
<Content Include="Views\UserManage\BulkDelete.cshtml" />
<Content Include="Providers\DataProviders\SqlDataProvider\01.04.01.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\01.05.00.SqlDataProvider" />
</ItemGroup>
<ItemGroup>
<Content Include="App_LocalResources\RolesManageController.resx" />
Expand Down
12 changes: 6 additions & 6 deletions Modules/UserManager/Upendo.UserManager.dnn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="Upendo.Modules.UserManager" type="Module" version="01.04.01">
<package name="Upendo.Modules.UserManager" type="Module" version="01.05.00">
<friendlyName>Upendo DNN User Manager</friendlyName>
<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>
<iconFile>DesktopModules/MVC/Upendo.Modules.UserManager/Images/logo.png</iconFile>
Expand Down Expand Up @@ -60,7 +60,7 @@
<attributes>
<businessControllerClass>Upendo.Modules.UserManager.Components.UserManagerController, Upendo.Modules.UserManager</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList>01.00.00,01.01.00,01.01.01,01.02.00,01.03.00,01.04.00,01.04.01</upgradeVersionsList>
<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>
</attributes>
</eventMessage>
</component>
Expand All @@ -69,7 +69,7 @@
<assembly>
<name>Upendo.Modules.UserManager.dll</name>
<path>bin</path>
<version>01.04.01</version>
<version>01.05.00</version>
</assembly>
</assemblies>
</component>
Expand All @@ -91,13 +91,13 @@
</script>
<script type="Install">
<path>Providers\DataProviders\SqlDataProvider</path>
<name>01.04.01.SqlDataProvider</name>
<version>01.04.01</version>
<name>01.05.00.SqlDataProvider</name>
<version>01.05.00</version>
</script>
<script type="UnInstall">
<path>Providers\DataProviders\SqlDataProvider</path>
<name>Uninstall.SqlDataProvider</name>
<version>01.04.01</version>
<version>01.05.01</version>
</script>
</scripts>
</component>
Expand Down
4 changes: 2 additions & 2 deletions Modules/UserManager/Upendo.UserManager_Symbols.dnn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<dotnetnuke type="Package" version="6.0">
<packages>
<package name="Upendo.Modules.UserManager_Symbols" type="Library" version="01.04.01">
<package name="Upendo.Modules.UserManager_Symbols" type="Library" version="01.05.00">
<friendlyName>Upendo DNN User Manager Symbols</friendlyName>
<description><![CDATA[Upendo DNN User Manager Extension for DNN]]></description>
<owner>
Expand All @@ -14,7 +14,7 @@
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>True</azureCompatible>
<dependencies>
<dependency type="managedPackage" version="1.4.1">Upendo.Modules.UserManager</dependency>
<dependency type="managedPackage" version="1.5.0">Upendo.Modules.UserManager</dependency>
</dependencies>
<components>
<component type="ResourceFile">
Expand Down
13 changes: 8 additions & 5 deletions Modules/UserManager/Views/UserManage/Index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@
<nav class="navbar navbar-default" role="navigation">
<div class="col-md2">
<a type="button" class="AM-btn AM-btn-primary" href="@Url.Action("Create", "UserManage", new {ctl = "Edit"})">
<span class="fa fa-plus color-white" aria-hidden="true"></span>
@Localization.GetString("BtnCreateUser", @ResourceFile)
</a>
</div>
<div class="col-md10 AM-d-flex AM-justify-content-end">
<div class="col-md10 AM-d-flex AM-justify-content-end mtb-2">
<span id="dialogs-DeleteUnauthorized mr5" class="dnnActions mr5" style="display: initial;">
<a type="button" class="confirm AM-btn AM-btn-danger" href="@Url.Action("DeleteUnauthorizedUsers", "UserManage", new {})" style="color: white;">
<span class="fa fa-trash color-white" aria-hidden="true"></span>
Expand Down Expand Up @@ -214,14 +215,16 @@
<span class="fa fa-tasks color-white" aria-hidden="true"></span>
</a>
<span id="dialogs-delete" class="dnnActions" style="display: initial;">
<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})">
<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})"
data-toggle="tooltip" data-placement="top" title="@Localization.GetString("DeleteUser", @ResourceFile)">
<span class="fa fa-trash color-white" aria-hidden="true"></span>
</a>
</span>
@if (ViewBag.IsCurrentUserSuperUser)
{
<span id="dialogs-impersonate" class="dnnActions" style="display: initial;">
<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})">
<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})"
data-toggle="tooltip" data-placement="top" title="@Localization.GetString("ImpersonateUser", @ResourceFile)">
<span class="fas fa-eye color-white" aria-hidden="true"></span>
</a>
</span>
Expand Down Expand Up @@ -258,8 +261,8 @@
var deleteUnauthorizedText = '@DotNetNuke.Services.Localization.Localization.GetString("DeleteUnauthorized.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Index.resx")';
var removeDeleteText = '@DotNetNuke.Services.Localization.Localization.GetString("RemoveDelete.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Index.resx")';
var impersonateText = '@DotNetNuke.Services.Localization.Localization.GetString("Impersonate.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx")';
var impersonateAnotherUserAccountConfirmation = '@DotNetNuke.Services.Localization.Localization.GetString("ImpersonateAnotherUserAccountConfirmation.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx")';
var impersonateAnotherUserAccountConfirmationAlert = '@DotNetNuke.Services.Localization.Localization.GetString("ImpersonateAnotherUserAccountConfirmationAlert.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx")';
var impersonateAnotherUserAccountConfirmation = '@Html.Raw(DotNetNuke.Services.Localization.Localization.GetString("ImpersonateAnotherUserAccountConfirmation.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx"))';
var impersonateAnotherUserAccountConfirmationAlert = '@Html.Raw(DotNetNuke.Services.Localization.Localization.GetString("ImpersonateAnotherUserAccountConfirmationAlert.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx"))';
var areYouSure = '@DotNetNuke.Services.Localization.Localization.GetString("AreYouSure.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Impersonate.resx")';
var cancel = '@DotNetNuke.Services.Localization.Localization.GetString("Cancel.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Shared.resx")';
var deleteBtnText = '@DotNetNuke.Services.Localization.Localization.GetString("Delete.Text", "~/DesktopModules/MVC/Upendo.Modules.UserManager/App_LocalResources/Shared.resx")';
Expand Down
24 changes: 24 additions & 0 deletions Modules/UserManager/releasenotes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,30 @@
<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>
</ul>

<h2>Release Notes: 01.05.00</h2>

<h3><strong>Enhancements</strong></h3>
<ul>
<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>
<!--
<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>
<li>None at this time.</li>
-->
</ul>

<h3><strong>Maintenance Updates &amp; Bug Fixes</strong></h3>
<ul>
<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>
<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>
<li>(no issue) - Now Compiles Against .NET 4.8. Thanks, <a href="https://github.com/WillStrohl" target="_blank">@WillStrohl</a>!</li>
<!--
<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>
<li>(no issue) - .</li>
<li>None at this time.</li>
-->
</ul>
<hr />

<h2>Release Notes: 01.04.01</h2>

<h3><strong>Enhancements</strong></h3>
Expand Down
57 changes: 34 additions & 23 deletions Modules/UserManager/web.config
Original file line number Diff line number Diff line change
@@ -1,24 +1,35 @@
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor">
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor" requirePermission="false" />
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor" requirePermission="false" />
</sectionGroup>
</configSections>
<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc"/>
<pages pageBaseType="DotNetNuke.Web.Mvc.Framework.DnnWebViewPage">
<namespaces>
<add namespace="System.Linq"/>
<add namespace="System.Web.Helpers" />
<add namespace="System.Web.Mvc" />
<add namespace="System.Web.Mvc.Ajax" />
<add namespace="System.Web.Mvc.Html" />
<add namespace="System.Web.Routing" />
<add namespace="System.Web.WebPages" />
<add namespace="DotNetNuke.Web.Mvc.Helpers"/>
</namespaces>
</pages>
</system.web.webPages.razor>
<?xml version="1.0"?>
<configuration>
<configSections>
<sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor">
<section name="host" type="System.Web.WebPages.Razor.Configuration.HostSection, System.Web.WebPages.Razor" requirePermission="false"/>
<section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor" requirePermission="false"/>
</sectionGroup>
</configSections>
<system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc"/>
<pages pageBaseType="DotNetNuke.Web.Mvc.Framework.DnnWebViewPage">
<namespaces>
<add namespace="System.Linq"/>
<add namespace="System.Web.Helpers"/>
<add namespace="System.Web.Mvc"/>
<add namespace="System.Web.Mvc.Ajax"/>
<add namespace="System.Web.Mvc.Html"/>
<add namespace="System.Web.Routing"/>
<add namespace="System.Web.WebPages"/>
<add namespace="DotNetNuke.Web.Mvc.Helpers"/>
</namespaces>
</pages>
</system.web.webPages.razor>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
The following attributes can be set on the <httpRuntime> tag.
<system.Web>
<httpRuntime targetFramework="4.8" />
</system.Web>
-->
<system.web>
<compilation targetFramework="4.8"/>
</system.web>
</configuration>

0 comments on commit b8047df

Please sign in to comment.