Changeset 7538

Timestamp:

Nov 28, 2018, 9:40:18 AM (4 years ago)

Author:

Nicklas Nordborg

Message:

References #2131: Add support for installing multiple authentication managers

Moved "Impersonate" functionality to it's own script file, since the latest changes caused it to re-load endlessly.

Location:

trunk/www

Files:

• impersonate.js (added)
• impersonate.jsp (modified) (1 diff)
• login.js (modified) (2 diffs)
• main.jsp (modified) (1 diff)

trunk/www/impersonate.jsp

@@ -53 +53 @@
   %>
   <base:page type="popup" title="Impersonate user">
-  <base:head scripts="~login.js" styles="login.css" />
+  <base:head scripts="~impersonate.js" styles="login.css" />
   <base:body>
     <h1>Impersonate user <base:help helpid="impersonateuser" /></h1>

trunk/www/login.js

@@ -39 +39 @@
       var lastLoginForm = login.getLastLoginForm();
       var selectedLoginForm = Data.get(document.body, 'login-form');
-      if (lastLoginForm && lastLoginForm != selectedLoginForm)
+      if (lastLoginForm && selectedLoginForm && lastLoginForm != selectedLoginForm)
       {
         login.switchLoginForm(lastLoginForm);
@@ -348 +348 @@
 Doc.onLoad(Login.initPage);
 
-var Impersonate = function()
-{
-  var pForm = 'login';
-  var impersonate = {};
-  
-  impersonate.initPage = function()
-  {
-    Buttons.addClickHandler('user_id.select', impersonate.selectUser);
-    Events.addEventHandler('user_id', 'base-selected', Items.onItemSelected);
-  }
-  
-  /**
-    Open the 'select user' dialog.
-  */
-  impersonate.selectUser = function()
-  {
-    var frm = document.forms[pForm];
-    var url = '&resetTemporary=1';
-    if (frm.user_id.length > 0)
-    {
-      var id = Math.abs(parseInt(frm.user_id[0].value));        
-      url += '&item_id='+id;
-    }
-    Dialogs.selectItem('USER', 'user_id', 0, url);
-  }
-  
-  return impersonate;
-}();
-
-Doc.onLoad(Impersonate.initPage);

trunk/www/main.jsp

@@ -130 +130 @@
     <input type="hidden" name="deviceToken" value="">
     
-    <table style="margin: auto; width: 700px;" id="the-login-form">
+    <table style="margin: auto; width: 700px; display: none;" id="the-login-form">
     <tr>
     <td>