#363 Show user fullname if available in navbar (earendilfr)

This commit is contained in:
Oliver Gorwits
2018-01-28 18:20:39 +00:00
parent 3f11009ebc
commit b1abf826dc
3 changed files with 12 additions and 4 deletions

View File

@@ -1,3 +1,9 @@
2.038032 - 2018-01-28
[ENHANCEMENTS]
* #363 Show user fullname if available in navbar (earendilfr)
2.038031 - 2018-01-23 2.038031 - 2018-01-23
[ENHANCEMENTS] [ENHANCEMENTS]

View File

@@ -57,7 +57,11 @@ post '/login' => sub {
); );
if ($success) { if ($success) {
my $user = schema('netdisco')->resultset('User')
->find( param('username') );
session logged_in_user => param('username'); session logged_in_user => param('username');
session logged_in_fullname => $user->fullname;
session logged_in_user_realm => $realm; session logged_in_user_realm => $realm;
schema('netdisco')->resultset('UserLog')->create({ schema('netdisco')->resultset('UserLog')->create({
@@ -67,9 +71,7 @@ post '/login' => sub {
details => param('return_url'), details => param('return_url'),
}); });
schema('netdisco')->resultset('User') $user->update({ last_on => \'now()' });
->find( session('logged_in_user') )
->update({ last_on => \'now()' });
return if request->is_ajax; return if request->is_ajax;
redirect param('return_url'); redirect param('return_url');

View File

@@ -174,7 +174,7 @@
[% ELSE %] [% ELSE %]
<i class="icon-user"></i> <i class="icon-user"></i>
[% END %]&nbsp; [% END %]&nbsp;
[% session.logged_in_user | html_entity %] <b class="caret"></b> [% session.logged_in_fullname || session.logged_in_user | html_entity %] <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
[% IF NOT user_has_role('ldap') %] [% IF NOT user_has_role('ldap') %]