From 60e6aab6daad6f62417eebcd905499080246edce Mon Sep 17 00:00:00 2001 From: Angelo Naselli Date: Thu, 26 Mar 2015 09:56:25 +0100 Subject: Managed the case in which no NTP is installed, as a warning by now --- lib/ManaTools/Module/Clock.pm | 21 ++++++++++++++++----- lib/ManaTools/Shared/TimeZone.pm | 2 -- 2 files changed, 16 insertions(+), 7 deletions(-) (limited to 'lib/ManaTools') diff --git a/lib/ManaTools/Module/Clock.pm b/lib/ManaTools/Module/Clock.pm index 548a397..e727298 100644 --- a/lib/ManaTools/Module/Clock.pm +++ b/lib/ManaTools/Module/Clock.pm @@ -273,10 +273,10 @@ sub _adminClockPanel { my $itemColl = new yui::YItemCollection; my $sel_serv = $self->sh_tz->currentNTPService(); foreach my $serv (@{$self->sh_tz->ntpServiceList()}) { - my $item = new yui::YItem ($serv, 0); - $item->setSelected(1) if ($sel_serv && $sel_serv eq $serv); - $itemColl->push($item); - $item->DISOWN(); + my $item = new yui::YItem ($serv, 0); + $item->setSelected(1) if ($sel_serv && $sel_serv eq $serv); + $itemColl->push($item); + $item->DISOWN(); } $ntpService->addItems($itemColl); $ntpService->setNotify(1); @@ -361,7 +361,18 @@ sub _adminClockPanel { last; } elsif ($widget == $ntpFrame) { - $dateTimeFrame->setEnabled(!$ntpFrame->value()); + if (scalar @{$self->sh_tz->ntpServiceList()} == 0) { + $self->sh_gui->warningMsgBox({ + title => $self->loc->N("manaclock: NTP service missed"), + text => $self->loc->N("Please install a NTP service such as chrony or ntp to manage"), + richtext => 1, + }); + $ntpFrame->setValue(0); + $dateTimeFrame->setEnabled(1); + } + else { + $dateTimeFrame->setEnabled(!$ntpFrame->value()); + } } elsif ($widget == $ntpService) { my $selection = $ntpService->selectedItem(); diff --git a/lib/ManaTools/Shared/TimeZone.pm b/lib/ManaTools/Shared/TimeZone.pm index 9aa7ef2..685a87b 100644 --- a/lib/ManaTools/Shared/TimeZone.pm +++ b/lib/ManaTools/Shared/TimeZone.pm @@ -152,8 +152,6 @@ has 'ntp_program' => ( sub _ntp_program_init { my $self = shift; - $DB::single = 1; - # looks for a running service from the configured ones, # if none is running chooses the first of the list my $list = $self->ntpServiceList(); -- cgit v1.2.1