Merge pull request #105 from UpendoVentures/dev

WillStrohl · web-flow · commit 67854b852780 · 2024-12-10T14:55:11.000-08:00
Syncing branches for 1.4.1 release
diff --git a/Modules/UserManager/Controllers/UserManageController.cs b/Modules/UserManager/Controllers/UserManageController.cs
@@ -153,6 +153,7 @@ public ActionResult Index(double? take, int? pageIndex, string filter, int? goTo
         public ActionResult Create()
         {
             DotNetNuke.Framework.JavaScriptLibraries.JavaScript.RequestRegistration(CommonJs.DnnPlugins);
+            ViewBag.IsCurrentUserSuperUser = _currentUser.IsSuperUser;
             return View();
         }
 
@@ -166,6 +167,10 @@ public ActionResult Create(UserViewModel item)
             {
                 return View(item);
             }
+            if (!_currentUser.IsSuperUser)
+            {
+                item.IsSuperUser = false;
+            }
             var userCreateStatus = UserRepository.CreateUser(item, portalId);
             if (userCreateStatus == UserCreateStatus.Success)
             {
@@ -201,10 +206,11 @@ public ActionResult Create(UserViewModel item)
                 }
                 string errorMessage = UserController.GetUserCreateStatus(userCreateStatus);
                 ModelState.AddModelError(string.Empty, errorMessage);
+                ViewBag.IsCurrentUserSuperUser = _currentUser.IsSuperUser;
                 return View(item);
             }
         }
-               
+
         public ActionResult Edit(int itemId)
         {
             var portalId = ModuleContext.PortalId;
@@ -221,6 +227,10 @@ public ActionResult Edit(UserViewModel item)
             var portalId = ModuleContext.PortalId;
             if (_currentUser.UserID != item.UserId)
             {
+                if (!_currentUser.IsSuperUser)
+                {
+                    item.IsSuperUser = false;
+                }
                 UserRepository.EditUser(portalId, item);
             }
             return RedirectToDefaultRoute();
@@ -265,8 +275,8 @@ public ActionResult BulkDelete(BulkDeleteViewModel bulkDeleteViewModel)
                 var userAlreadyBeenDeletedPreviously = 0;
                 var userMarkedDeleted = 0;
                 var userNotFound = 0;
-                var userInvalid = 0; 
-                
+                var userInvalid = 0;
+
                 var resultLogPermanentlyDeleted = new StringBuilder();
                 var resultLogAlreadyBeenDeletedPreviously = new StringBuilder();
                 var resultLogMarkedDeleted = new StringBuilder();
diff --git a/Modules/UserManager/Module.css b/Modules/UserManager/Module.css
@@ -210,7 +210,7 @@
     margin-top: 20px;
 }
 
-.admin-manager #checkbox {
+.admin-manager #checkbox, #chkCIsSuperuser {
     margin-top: 20px;
     margin-bottom: 20px;
     height: 20px;
diff --git a/Modules/UserManager/Properties/AssemblyInfo.cs b/Modules/UserManager/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("01.04.00")]
-[assembly: AssemblyFileVersion("01.04.00")]
+[assembly: AssemblyVersion("01.04.01")]
+[assembly: AssemblyFileVersion("01.04.01")]
diff --git a/Modules/UserManager/Upendo.UserManager.dnn b/Modules/UserManager/Upendo.UserManager.dnn
@@ -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.00">
+    <package name="Upendo.Modules.UserManager" type="Module" version="01.04.01">
       <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>
@@ -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</upgradeVersionsList>
+              <upgradeVersionsList>01.00.00,01.01.00,01.01.01,01.02.00,01.03.00,01.04.00,01.04.01</upgradeVersionsList>
             </attributes>
           </eventMessage>
         </component>
@@ -69,7 +69,7 @@
             <assembly>
               <name>Upendo.Modules.UserManager.dll</name>
               <path>bin</path>
-              <version>01.04.00</version>
+              <version>01.04.01</version>
             </assembly>
           </assemblies>
         </component>
@@ -92,7 +92,7 @@
             <script type="UnInstall">
               <path>Providers\DataProviders\SqlDataProvider</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>01.04.00</version>
+              <version>01.04.01</version>
             </script>
           </scripts>
         </component>
diff --git a/Modules/UserManager/Upendo.UserManager_Symbols.dnn b/Modules/UserManager/Upendo.UserManager_Symbols.dnn
@@ -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.00">
+    <package name="Upendo.Modules.UserManager_Symbols" type="Library" version="01.04.01">
       <friendlyName>Upendo DNN User Manager Symbols</friendlyName>
       <description><![CDATA[Upendo DNN User Manager Extension for DNN]]></description>
       <owner>
@@ -14,7 +14,7 @@
       <releaseNotes src="ReleaseNotes.txt" />
       <azureCompatible>True</azureCompatible>
       <dependencies>
-        <dependency type="managedPackage" version="1.4.0">Upendo.Modules.UserManager</dependency>
+        <dependency type="managedPackage" version="1.4.1">Upendo.Modules.UserManager</dependency>
       </dependencies>
       <components>
         <component type="ResourceFile">
diff --git a/Modules/UserManager/Views/UserManage/Create.cshtml b/Modules/UserManager/Views/UserManage/Create.cshtml
@@ -77,8 +77,8 @@
             </div>
             <div class="col-md-12">
                 <div class="AMFormItem col-md-3">
-                    @Html.CheckBoxFor(m => m.IsSuperUser, new { @id = "checkbox" })
-                    <label>@Localization.GetString("IsSuperUser", @ResourceFile)</label>
+                    @Html.CheckBoxFor(m => m.IsSuperUser, new { @id = "chkCIsSuperuser" })
+                    <label for="chkCIsSuperuser">@Localization.GetString("IsSuperUser", @ResourceFile)</label>
                 </div>
                 <div class="AMFormItem col-md-3">
                     @Html.CheckBoxFor(m => m.Approved, new { @id = "checkbox" })
@@ -104,6 +104,14 @@
     </div>
 </div>
 <script type="text/javascript">
+    document.addEventListener("DOMContentLoaded", function () {
+        var isCurrentUserSuperUser = @Json.Encode(ViewBag.IsCurrentUserSuperUser);
+        var superuserCheckbox = document.getElementById("chkCIsSuperuser");
+
+        if (superuserCheckbox) {
+            superuserCheckbox.disabled = !isCurrentUserSuperUser;
+        }
+    });
   var weak = '@Localization.GetString("Weak.Text", @ResourceFile)';
   var fair = '@Localization.GetString("Fair.Text", @ResourceFile)';
   var strong = '@Localization.GetString("Strong.Text", @ResourceFile)';
diff --git a/Modules/UserManager/releasenotes.txt b/Modules/UserManager/releasenotes.txt
@@ -14,11 +14,10 @@
 	<p>Sponsorship is <em>Powered by GitHub Sponsors</em> and ensures that this project lives and thrives. <a href="https://github.com/sponsors/UpendoVentures" target="_blank">Please consider contributing</a> any amount.</p>
 	<p>THANK YOU to the following rockstars!</p>
 	<ul>
-		<li>Dan Rice, <a href="https://www.puresystems.co.uk/" target="_blank">Pure Systems</a></li>
 		<li>Adam Bernstein, <a href="https://practicewise.com/" target="_blank">PracticeWise</a></li>
 		<li>Jeremy Farrance, <a href="https://accuraty.com/" target="_blank">Accuraty</a></li>
 		<li><a href="https://github.com/JohnRamminger" target="_blank">John Ramminger</a></li>
-		<li>(<em>and two anonymous sponsors</em>)</li>
+		<li>(<i>two private sponsors</i>)</li>
 	</ul>
 	
 	<h3>Contributors</h3>
@@ -34,6 +33,27 @@
 		<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.04.01</h2>
+	
+	<h3><strong>Enhancements</strong></h3>
+	<ul>
+		<li>None at this time.</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</strong></h3>
+	<ul>
+		<li>Prevent Non-Superusers from Creating Superuser Accounts. (No Issue) Thanks, <a href="https://github.com/alejoroman0605" target="_blank">@alejoroman0605</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>
+		-->
+	</ul>
+	<hr />
+
 	<h2>Release Notes: 01.04.00</h2>
 	
 	<h3><strong>Enhancements</strong></h3>

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ public ActionResult Index(double? take, int? pageIndex, string filter, int? goTo`
`153`	`153`	`public ActionResult Create()`
`154`	`154`	`{`
`155`	`155`	`DotNetNuke.Framework.JavaScriptLibraries.JavaScript.RequestRegistration(CommonJs.DnnPlugins);`
	`156`	`+ ViewBag.IsCurrentUserSuperUser = _currentUser.IsSuperUser;`
`156`	`157`	`return View();`
`157`	`158`	`}`
`158`	`159`
`@@ -166,6 +167,10 @@ public ActionResult Create(UserViewModel item)`
`166`	`167`	`{`
`167`	`168`	`return View(item);`
`168`	`169`	`}`
	`170`	`+ if (!_currentUser.IsSuperUser)`
	`171`	`+ {`
	`172`	`+ item.IsSuperUser = false;`
	`173`	`+ }`
`169`	`174`	`var userCreateStatus = UserRepository.CreateUser(item, portalId);`
`170`	`175`	`if (userCreateStatus == UserCreateStatus.Success)`
`171`	`176`	`{`
`@@ -201,10 +206,11 @@ public ActionResult Create(UserViewModel item)`
`201`	`206`	`}`
`202`	`207`	`string errorMessage = UserController.GetUserCreateStatus(userCreateStatus);`
`203`	`208`	`ModelState.AddModelError(string.Empty, errorMessage);`
	`209`	`+ ViewBag.IsCurrentUserSuperUser = _currentUser.IsSuperUser;`
`204`	`210`	`return View(item);`
`205`	`211`	`}`
`206`	`212`	`}`
`207`		`-`
	`213`	`+`
`208`	`214`	`public ActionResult Edit(int itemId)`
`209`	`215`	`{`
`210`	`216`	`var portalId = ModuleContext.PortalId;`
`@@ -221,6 +227,10 @@ public ActionResult Edit(UserViewModel item)`
`221`	`227`	`var portalId = ModuleContext.PortalId;`
`222`	`228`	`if (_currentUser.UserID != item.UserId)`
`223`	`229`	`{`
	`230`	`+ if (!_currentUser.IsSuperUser)`
	`231`	`+ {`
	`232`	`+ item.IsSuperUser = false;`
	`233`	`+ }`
`224`	`234`	`UserRepository.EditUser(portalId, item);`
`225`	`235`	`}`
`226`	`236`	`return RedirectToDefaultRoute();`
`@@ -265,8 +275,8 @@ public ActionResult BulkDelete(BulkDeleteViewModel bulkDeleteViewModel)`
`265`	`275`	`var userAlreadyBeenDeletedPreviously = 0;`
`266`	`276`	`var userMarkedDeleted = 0;`
`267`	`277`	`var userNotFound = 0;`
`268`		`- var userInvalid = 0;`
`269`		`-`
	`278`	`+ var userInvalid = 0;`
	`279`	`+`
`270`	`280`	`var resultLogPermanentlyDeleted = new StringBuilder();`
`271`	`281`	`var resultLogAlreadyBeenDeletedPreviously = new StringBuilder();`
`272`	`282`	`var resultLogMarkedDeleted = new StringBuilder();`
Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,7 @@`
`210`	`210`	`margin-top: 20px;`
`211`	`211`	`}`
`212`	`212`
`213`		`-.admin-manager #checkbox {`
	`213`	`+.admin-manager #checkbox, #chkCIsSuperuser {`
`214`	`214`	`margin-top: 20px;`
`215`	`215`	`margin-bottom: 20px;`
`216`	`216`	`height: 20px;`