new displayname option for default database
This commit is contained in:
@@ -247,7 +247,7 @@ hook after_error_render => sub { setting('layout' => 'main') };
|
|||||||
tag => $_->{'tag'},
|
tag => $_->{'tag'},
|
||||||
path => config->{'url_base'}->with("/t/$_->{tag}")->path } ) }
|
path => config->{'url_base'}->with("/t/$_->{tag}")->path } ) }
|
||||||
@{ setting('tenant_databases') },
|
@{ setting('tenant_databases') },
|
||||||
{ tag => 'netdisco', displayname => 'Default' }
|
{ tag => 'netdisco', displayname => (setting('database')->{displayname} || 'Default') }
|
||||||
});
|
});
|
||||||
config->{'tenant_data'}->{'netdisco'}->{'path'}
|
config->{'tenant_data'}->{'netdisco'}->{'path'}
|
||||||
= URI::Based->new((config->{path} eq '/') ? '' : config->{path})->path;
|
= URI::Based->new((config->{path} eq '/') ? '' : config->{path})->path;
|
||||||
|
|||||||
@@ -176,7 +176,7 @@
|
|||||||
<li class="dropdown">
|
<li class="dropdown">
|
||||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
||||||
<i class="icon-home text-success"></i>
|
<i class="icon-home text-success"></i>
|
||||||
[% settings.tenant_data.$tenant.displayname || 'Default' | html_entity %]
|
[% (settings.tenant_data.$tenant.displayname || settings.database.displayname || 'Default') | html_entity %]
|
||||||
<b class="caret"></b>
|
<b class="caret"></b>
|
||||||
</a>
|
</a>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
|
|||||||
Reference in New Issue
Block a user