diff options
| author | Simon Rettberg | 2015-09-18 16:59:23 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-18 16:59:23 +0200 |
| commit | 05ed28bbcbe9abe242c19fc7088cfd383db52588 (patch) | |
| tree | 1ff589012cc5d58a9d98957ce8486ceefd7da6f3 /templates/sysconfig | |
| parent | Change some wording, add deletion reminder to main page (diff) | |
| download | slx-admin-05ed28bbcbe9abe242c19fc7088cfd383db52588.tar.gz slx-admin-05ed28bbcbe9abe242c19fc7088cfd383db52588.tar.xz slx-admin-05ed28bbcbe9abe242c19fc7088cfd383db52588.zip | |
[ldap/ad] Figure out proper spelling of search base
Diffstat (limited to 'templates/sysconfig')
| -rw-r--r-- | templates/sysconfig/ad-checkconnection.html | 1 | ||||
| -rw-r--r-- | templates/sysconfig/ad-checkcredentials.html | 5 | ||||
| -rw-r--r-- | templates/sysconfig/ldap-checkconnection.html | 1 | ||||
| -rw-r--r-- | templates/sysconfig/ldap-checkcredentials.html | 16 |
4 files changed, 12 insertions, 11 deletions
diff --git a/templates/sysconfig/ad-checkconnection.html b/templates/sysconfig/ad-checkconnection.html index f5fcb2a8..0c7cd77f 100644 --- a/templates/sysconfig/ad-checkconnection.html +++ b/templates/sysconfig/ad-checkconnection.html @@ -9,6 +9,7 @@ <div class="pull-left"> <form role="form" method="post" action="?do=SysConfig&action=addmodule&step=AdAuth_Start"> <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="edit" value="{{edit}}"> <input name="title" value="{{title}}" type="hidden"> <input name="server" value="{{server}}" type="hidden"> <input name="searchbase" value="{{searchbase}}" type="hidden"> diff --git a/templates/sysconfig/ad-checkcredentials.html b/templates/sysconfig/ad-checkcredentials.html index 9378adad..dbd09d58 100644 --- a/templates/sysconfig/ad-checkcredentials.html +++ b/templates/sysconfig/ad-checkcredentials.html @@ -11,6 +11,7 @@ <div class="pull-left"> <form role="form" method="post" action="?do=SysConfig&action=addmodule&step=AdAuth_Start"> <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="edit" value="{{edit}}"> <input name="title" value="{{title}}" type="hidden"> <input name="server" value="{{server}}" type="hidden"> <input name="searchbase" value="{{searchbase}}" type="hidden"> @@ -30,6 +31,7 @@ <input name="title" value="{{title}}" type="hidden"> <input name="server" value="{{server}}" type="hidden"> <input name="searchbase" value="{{searchbase}}" type="hidden"> + <input id="setbase" name="somedn" value="" type="hidden"> <input id="setdn" name="binddn" value="{{binddn}}" type="hidden"> <input name="bindpw" value="{{bindpw}}" type="hidden"> <input name="home" value="{{home}}" type="hidden"> @@ -47,6 +49,9 @@ if (!task || !task.statusCode) return; if (task.statusCode === 'TASK_FINISHED') { + if (task.data && task.data.dn) { + $('#setbase').val(task.data.dn); + } $('#nextbutton').html('Weiter »').show(); } if (task.statusCode === 'TASK_ERROR' || task.statusCode === 'PARENT_FAILED') { diff --git a/templates/sysconfig/ldap-checkconnection.html b/templates/sysconfig/ldap-checkconnection.html index 39408526..b661a263 100644 --- a/templates/sysconfig/ldap-checkconnection.html +++ b/templates/sysconfig/ldap-checkconnection.html @@ -9,6 +9,7 @@ <div class="pull-left"> <form role="form" method="post" action="?do=SysConfig&action=addmodule&step=LdapAuth_Start"> <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="edit" value="{{edit}}"> <input name="title" value="{{title}}" type="hidden"> <input name="server" value="{{server}}" type="hidden"> <input name="searchbase" value="{{searchbase}}" type="hidden"> diff --git a/templates/sysconfig/ldap-checkcredentials.html b/templates/sysconfig/ldap-checkcredentials.html index f089c4ab..77736c9c 100644 --- a/templates/sysconfig/ldap-checkcredentials.html +++ b/templates/sysconfig/ldap-checkcredentials.html @@ -3,7 +3,6 @@ </p> <div id="zeug"> - <div data-tm-id="{{self-search}}" data-tm-log="messages" data-tm-callback="selfCb">LDAP Self-Query</div> <div data-tm-id="{{tm-search}}" data-tm-log="messages" data-tm-callback="ldapCb">LDAP Test-Query</div> </div> <i>{{lang_onProblemSearchBase}}</i> @@ -11,6 +10,7 @@ <div class="pull-left"> <form role="form" method="post" action="?do=SysConfig&action=addmodule&step=LdapAuth_Start"> <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="edit" value="{{edit}}"> <input name="title" value="{{title}}" type="hidden"> <input name="server" value="{{server}}" type="hidden"> <input name="searchbase" value="{{searchbase}}" type="hidden"> @@ -30,6 +30,7 @@ <input name="title" value="{{title}}" type="hidden"> <input name="server" value="{{server}}" type="hidden"> <input name="searchbase" value="{{searchbase}}" type="hidden"> + <input id="setbase" name="somedn" value="" type="hidden"> <input id="setdn" name="binddn" value="{{binddn}}" type="hidden"> <input name="bindpw" value="{{bindpw}}" type="hidden"> <input name="home" value="{{home}}" type="hidden"> @@ -47,6 +48,9 @@ if (!task || !task.statusCode) return; if (task.statusCode === 'TASK_FINISHED') { + if (task.data && task.data.dn) { + $('#setbase').val(task.data.dn); + } $('#nextbutton').html('Weiter »').show(); } if (task.statusCode === 'TASK_ERROR' || task.statusCode === 'PARENT_FAILED') { @@ -56,14 +60,4 @@ $('#nextbutton').show(); } } - function selfCb(task) - { - if (!task || !task.statusCode) - return; - if (task.statusCode === 'TASK_FINISHED' && task.data && task.data.dn) { - $('#setdn').val(task.data.dn); - } else { - $('#nextbutton').html('Trotzdem weiter »'); - } - } </script> |