From e4219cd3279c896d85d5e7b52d25208153d8d4a8 Mon Sep 17 00:00:00 2001 From: matteo Date: Thu, 3 Jul 2014 21:32:56 +0300 Subject: fixed checkbox behaviour --- lib/AdminPanel/Module/Proxy.pm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'lib/AdminPanel/Module') diff --git a/lib/AdminPanel/Module/Proxy.pm b/lib/AdminPanel/Module/Proxy.pm index 4e6b96e..98d3105 100644 --- a/lib/AdminPanel/Module/Proxy.pm +++ b/lib/AdminPanel/Module/Proxy.pm @@ -158,7 +158,6 @@ sub validate { sub _manageProxyDialog { my $self = shift; - my $httpsProxyEqualToHttpProxy = 0; ## TODO fix for adminpanel my $appTitle = yui::YUI::app()->applicationTitle(); my $appIcon = yui::YUI::app()->applicationIcon(); @@ -173,18 +172,19 @@ sub _manageProxyDialog { my $inputfield_width = 45; # getVarsFromSh returns an empty hash if no vars are defined my $proxy_curr_settings = { getVarsFromSh('/etc/profile.d/proxy.sh') }; + my $httpsProxyEqualToHttpProxy = 1 if(($proxy_curr_settings->{http_proxy} eq $proxy_curr_settings->{https_proxy})&&($proxy_curr_settings->{http_proxy} ne "")); # # @layout # - # +--------------------------------+ - # | HEADER | - # |--------------------------------+ - # | CONTENT | - # |--------------------------------+ - # | OTHER OPTIONS | - # | | - # +--------------------------------+ + # +------------------------------+ + # | +------------+-------------+ | + # | |LABELS | VALUES | | + # | | | | | + # | | | | | + # | | | | | + # | +------------+-------------+ | + # +------------------------------+ $self->dialog($factory->createMainDialog()); my $layout = $factory->createVBox($self->dialog); @@ -214,7 +214,8 @@ sub _manageProxyDialog { $http_proxy->setWeight($yui::YD_HORIZ, 30); # flag to setup the https proxy with the same value of the http proxy - $factory->createCheckBox($vbox_labels_flags, "Use HTTP proxy for HTTPS connections",$httpsProxyEqualToHttpProxy); + my $ckbHttpEqHttps = $factory->createCheckBox($vbox_labels_flags, "Use HTTP proxy for HTTPS connections",$httpsProxyEqualToHttpProxy); + $ckbHttpEqHttps->setNotify(1); # add a spacing as we have $factory->createLabel($factory->createHBox($vbox_inputfields)," "); @@ -288,6 +289,8 @@ sub _manageProxyDialog { } # validation failed next; + }elsif ($widget == $ckbHttpEqHttps){ + $https_proxy->setEnabled(!$ckbHttpEqHttps->isChecked()); } } } -- cgit v1.2.1