Skip to content

Commit 2878fba

Browse files
Ahmet OeztuerkAhmet Oeztuerk
authored andcommitted
try reading the prefixed excel columns on service details, host details as well.
seems to fix the problem where contacts were not being added to host/service data
1 parent 1ef5a4c commit 2878fba

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

lib/Thruk/Controller/status.pm

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ sub _process_details_page {
452452

453453
my $user_data = Thruk::Utils::get_user_data($c);
454454
$c->stash->{'default_columns'}->{'dfl_'} = Thruk::Utils::Status::get_service_columns($c);
455-
my $selected_columns = join(",", @{Thruk::Base::list($c->req->parameters->{'dfl_columns'} || $c->req->parameters->{'columns'} || $user_data->{'columns'}->{'svc'} || $c->config->{'default_service_columns'})});
455+
my $selected_columns = join(",", @{Thruk::Base::list($c->req->parameters->{'dfl_columns'} || $c->req->parameters->{'status_detail_excel_columns'} || $c->req->parameters->{'columns'} || $user_data->{'columns'}->{'svc'} || $c->config->{'default_service_columns'})});
456456
$c->stash->{'table_columns'}->{'dfl_'} = Thruk::Utils::Status::sort_table_columns($c->stash->{'default_columns'}->{'dfl_'}, $selected_columns);
457457
$c->stash->{'comments_by_host'} = {};
458458
$c->stash->{'comments_by_host_service'} = {};
@@ -612,7 +612,11 @@ sub _process_hostdetails_page {
612612
$c->stash->{'status_search_add_default_filter'} = "host";
613613

614614
my $user_data = Thruk::Utils::get_user_data($c);
615-
my $selected_columns = join(",", @{Thruk::Base::list($c->req->parameters->{'dfl_columns'} || $c->req->parameters->{'columns'} || $user_data->{'columns'}->{'hst'} || $c->config->{'default_host_columns'})});
615+
Thruk::Utils::Log::_info("\$c->req->parameters");
616+
Thruk::Utils::Log::_info($c->req->parameters);
617+
my $selected_columns = join(",", @{Thruk::Base::list($c->req->parameters->{'dfl_columns'} || $c->req->parameters->{'status_hostdetail_excel_columns'} || $c->req->parameters->{'columns'} || $user_data->{'columns'}->{'hst'} || $c->config->{'default_host_columns'})});
618+
Thruk::Utils::Log::_info("\$selected_columns");
619+
Thruk::Utils::Log::_info($selected_columns);
616620
$c->stash->{'show_host_attempts'} = defined $c->config->{'show_host_attempts'} ? $c->config->{'show_host_attempts'} : 0;
617621
$c->stash->{'default_columns'}->{'dfl_'} = Thruk::Utils::Status::get_host_columns($c);
618622
$c->stash->{'table_columns'}->{'dfl_'} = Thruk::Utils::Status::sort_table_columns($c->stash->{'default_columns'}->{'dfl_'}, $selected_columns);

0 commit comments

Comments
 (0)