IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Display loginas information only after login

Browse Source 
Message 'Logged in as: user@FREEIPA.ORG' was displayed before user was logged in. It was wrong.

Now 'Logged in as: XXX' is displayed only when user XXX is logged in. So no more user@FREEIPA.ORG :) .

https://fedorahosted.org/freeipa/ticket/2882
This commit is contained in:
Petr Vobornik 2012-06-28 14:42:29 +02:00
parent 29fd982f7f
commit 05cf7c53a6
4 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install/ui/index.html
View File

@ -71,10 +71,10 @@
</span>
<span class="header-right">
<span class="header-passwordexpires"></span>
<span id="loggedinas" class="header-loggedinas">
<a href="#"><span id="login_header">Logged in as</span>: <strong>user@FREEIPA.ORG</strong></a>
<span id="loggedinas" class="header-loggedinas" style="visibility:hidden;">
<a href="#"><span id="login_header">Logged in as</span>: <span class="login"></span></a>
</span>
<span class="header-loggedinas">
<span class="header-loggedinas" style="visibility:hidden;">
| <a href="#logout" id="logout">Logout</a>
</span>
<span id="header-network-activity-indicator" class="network-activity-indicator">

4
install/ui/ipa.css
View File

@ -262,6 +262,10 @@ body {
color: #fff;
}
.header-loggedinas .login {
font-weight: bold;
}
/* ---- Navigation ---- */
#navigation {
position: absolute;

6
install/ui/ipa.js
View File

@ -157,7 +157,6 @@ var IPA = function() {
on_success: function(data, text_status, xhr) {
that.whoami = batch ? data.result[0] : data.result.result[0];
that.principal = that.whoami.krbprincipalname[0];
that.update_password_expiration();
}
});
};
@ -516,6 +515,11 @@ IPA.password_selfservice = function() {
self_service: true,
on_success: function() {
var command = IPA.get_whoami_command();
var orig_on_success = command.on_success;
command.on_success = function(data, text_status, xhr) {
orig_on_success.call(this, data, text_status, xhr);
IPA.update_password_expiration();
};
command.execute();
alert(IPA.messages.password.password_change_complete);

5
install/ui/webui.js
View File

@ -167,7 +167,7 @@ $(function() {
var whoami = IPA.whoami;
IPA.whoami_pkey = whoami.uid[0];
$('#loggedinas strong').text(whoami.cn[0]);
$('#loggedinas .login').text(whoami.cn[0]);
$('#loggedinas a').fragment(
{'user-facet': 'details', 'user-pkey': IPA.whoami_pkey}, 2);
@ -176,6 +176,9 @@ $(function() {
return false;
}).text(IPA.messages.login.logout);
$('.header-loggedinas').css('visibility','visible');
IPA.update_password_expiration();
IPA.nav = create_navigation();
IPA.nav.create();
IPA.nav.update();