fixed an issue with the change password popup (enterprise mode / loca…

…l admin), which wasn't displayed correctly updated the myrtille project url
saberyyyyy · Sep 24, 2020 · 3b393e2 · 3b393e2
1 parent 47c9795
commit 3b393e2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,4 @@
-2020-09-20 Version 2.9.0 (stable)
+2020-09-24 Version 2.9.0 (stable)
 	added a virtual on-screen keyboard (multi-languages)
 	popups are now draggable
 	showing the toolbar no longer shifts the display down
@@ -16,6 +16,8 @@
 	fixed an issue with messages containing the ";" character
 	fixed an issue with file transfer when using a domain (thanks camjcorley)
 	fixed an issue with the tab key in SSH mode (this also fixes shell autocompletion)
+	fixed an issue with the change password popup (enterprise mode / local admin), which wasn't displayed correctly
+	updated the myrtille project url
 	refactoring
 
 2020-04-20 Version 2.8.1 (stable)

diff --git a/Myrtille.Setup/Myrtille.Setup.vdproj b/Myrtille.Setup/Myrtille.Setup.vdproj
@@ -2960,7 +2960,7 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Myrtille"
-        "ProductCode" = "8:{DE4FFD9F-65D4-418B-9A3F-9A6CBAB10BF8}"
+        "ProductCode" = "8:{4665580A-61A2-4B7C-98FF-9E44C9012104}"
         "PackageCode" = "8:{3F82D8DB-CDDC-4128-BF9F-03BFB5255C41}"
         "UpgradeCode" = "8:{86A6145E-11DB-4EE7-9CE0-53F997050716}"
         "AspNetVersion" = "8:4.0.30319.0"

diff --git a/Myrtille.Web/Default.aspx b/Myrtille.Web/Default.aspx
@@ -183,7 +183,7 @@
 
                 <!-- myrtille version -->
                 <div id="version">
-                    <a href="http://cedrozor.github.io/myrtille/" target="_blank" title="myrtille">
+                    <a href="https://www.myrtille.io/" target="_blank" title="myrtille">
                         <img src="img/myrtille.png" alt="myrtille" width="15px" height="15px"/>
                     </a>
                     <span>

diff --git a/Myrtille.Web/Default.aspx.cs b/Myrtille.Web/Default.aspx.cs
@@ -748,7 +748,7 @@ private void CreateEnterpriseSessionFromLogin()
                     }
                     else if (_enterpriseSession.AuthenticationErrorCode == EnterpriseAuthenticationErrorCode.PASSWORD_EXPIRED)
                     {
-                        ClientScript.RegisterClientScriptBlock(GetType(), Guid.NewGuid().ToString(), string.Format("openPopup('changePasswordPopup', 'EnterpriseChangePassword.aspx?userName={0}" + (_localAdmin ? "&mode=admin');" : "');"), user.Value), true);
+                        ClientScript.RegisterClientScriptBlock(GetType(), Guid.NewGuid().ToString(), "window.onload = function() { " + string.Format("openPopup('changePasswordPopup', 'EnterpriseChangePassword.aspx?userName={0}" + (_localAdmin ? "&mode=admin" : string.Empty) + "');", user.Value) + " }", true);
                     }
                     else
                     {

diff --git a/Myrtille.Web/js/dialog.js b/Myrtille.Web/js/dialog.js
@@ -480,7 +480,7 @@ function openPopup(id, src, fade)
     }
     catch (exc)
     {
-        this.showDebug('openPopup error: ' + exc.message);
+        console.error('openPopup error: ' + exc.message);
     }
 }
 
@@ -511,7 +511,7 @@ function closePopup()
     }
     catch (exc)
     {
-        this.showDebug('closePopup error: ' + exc.message);
+        console.error('closePopup error: ' + exc.message);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -748,7 +748,7 @@ private void CreateEnterpriseSessionFromLogin() @@
                         }
                         else if (_enterpriseSession.AuthenticationErrorCode == EnterpriseAuthenticationErrorCode.PASSWORD_EXPIRED)
                         {
-                            ClientScript.RegisterClientScriptBlock(GetType(), Guid.NewGuid().ToString(), string.Format("openPopup('changePasswordPopup', 'EnterpriseChangePassword.aspx?userName={0}" + (_localAdmin ? "&mode=admin');" : "');"), user.Value), true);
+                            ClientScript.RegisterClientScriptBlock(GetType(), Guid.NewGuid().ToString(), "window.onload = function() { " + string.Format("openPopup('changePasswordPopup', 'EnterpriseChangePassword.aspx?userName={0}" + (_localAdmin ? "&mode=admin" : string.Empty) + "');", user.Value) + " }", true);
                         }
                         else
                         {
@@ Expand Down @@