From 9c07548c71460eecdc82fc504c94df0fb604765e Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 17 Jan 2006 17:47:12 +0000 Subject: [PATCH] more missing session vars in form calls --- lib/WebGUI/Asset/Shortcut.pm | 6 ++---- lib/WebGUI/Asset/Wobject/DataForm.pm | 2 +- lib/WebGUI/Form/Asset.pm | 8 ++++---- lib/WebGUI/Form/Combo.pm | 3 +-- lib/WebGUI/Form/DateTime.pm | 7 ++++--- lib/WebGUI/Form/Interval.pm | 8 ++++---- lib/WebGUI/Form/List.pm | 3 +-- lib/WebGUI/Form/TimeField.pm | 6 ++---- lib/WebGUI/Form/YesNo.pm | 6 ++---- lib/WebGUI/Operation/ProfileSettings.pm | 2 +- 10 files changed, 22 insertions(+), 29 deletions(-) diff --git a/lib/WebGUI/Asset/Shortcut.pm b/lib/WebGUI/Asset/Shortcut.pm index 31f8b0de6..e2f5c504c 100644 --- a/lib/WebGUI/Asset/Shortcut.pm +++ b/lib/WebGUI/Asset/Shortcut.pm @@ -317,8 +317,7 @@ sub getFieldsList { } $output .= '
'; my @prefFieldsToShow = split("\n",$self->getValue("prefFieldsToShow")); - $output .= WebGUI::Form::CheckList->new( - $self->session, + $output .= WebGUI::Form::CheckList->new($self->session, -name=>"prefFieldsToShow", -value=>\@prefFieldsToShow, -options=>\%fieldNames, @@ -329,8 +328,7 @@ sub getFieldsList { )->toHtmlWithWrapper; $output .= '
'; my @prefFieldsToImport = split("\n",$self->getValue("prefFieldsToImport")); - $output .= WebGUI::Form::CheckList->new( - $self->session, + $output .= WebGUI::Form::CheckList->new($self->session, -name=>"prefFieldsToImport", -value=>\@prefFieldsToImport, -options=>\%fieldNames, diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm index 156887847..69a07950c 100644 --- a/lib/WebGUI/Asset/Wobject/DataForm.pm +++ b/lib/WebGUI/Asset/Wobject/DataForm.pm @@ -73,7 +73,7 @@ sub _createField { } } my $cmd = "WebGUI::Form::".$data->{type}; - return &$cmd(\%param); + return &$cmd($self->session, \%param); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Form/Asset.pm b/lib/WebGUI/Form/Asset.pm index 6fb8714e3..e35f0c42e 100644 --- a/lib/WebGUI/Form/Asset.pm +++ b/lib/WebGUI/Form/Asset.pm @@ -95,20 +95,20 @@ Renders an asset selector. sub toHtml { my $self = shift; - my $asset = WebGUI::Asset->newByDynamicClass($self->get("value")) || WebGUI::Asset->getRoot($self->session); - return WebGUI::Form::Hidden->new( + my $asset = WebGUI::Asset->newByDynamicClass($self->session, $self->get("value")) || WebGUI::Asset->getRoot($self->session); + return WebGUI::Form::Hidden->new($self->session, name=>$self->get("name"), extras=>$self->get("extras"), value=>$asset->getId, id=>$self->get("id"), )->toHtml - .WebGUI::Form::Text->new( + .WebGUI::Form::Text->new($self->session, name=>$self->get("name")."_display", extras=>' readonly="1" ', value=>$asset->get("title"), id=>$self->get('id')."_display" )->toHtml - .WebGUI::Form::Button->new( + .WebGUI::Form::Button->new($self->session, value=>"...", extras=>'onclick="window.open(\''.$asset->getUrl("op=formAssetTree;classLimiter=".$self->get("class").";formId=".$self->get('id')).'\',\'assetPicker\',\'toolbar=no, location=no, status=no, directories=no, width=400, height=400\');"' )->toHtml; diff --git a/lib/WebGUI/Form/Combo.pm b/lib/WebGUI/Form/Combo.pm index 57d2b554d..a564466fd 100644 --- a/lib/WebGUI/Form/Combo.pm +++ b/lib/WebGUI/Form/Combo.pm @@ -100,8 +100,7 @@ sub toHtml { $self->get("options")->{''} = '['.$i18n->get(582).']'; $self->get("options")->{_new_} = $i18n->get(581).'->'; return $self->SUPER::toHtml - .WebGUI::Form::Text->new( - $self->session, + .WebGUI::Form::Text->new($self->session, size=>$self->session->setting->get("textBoxSize")-5, name=>$self->get("name")."_new", id=>$self->get('id')."_new" diff --git a/lib/WebGUI/Form/DateTime.pm b/lib/WebGUI/Form/DateTime.pm index a0fe1ddf1..b8f2a3b57 100644 --- a/lib/WebGUI/Form/DateTime.pm +++ b/lib/WebGUI/Form/DateTime.pm @@ -114,16 +114,17 @@ Renders a date picker control. sub toHtml { my $self = shift; my $value = $self->session->datetime->epochToSet($self->get("value"),1); - my $language = WebGUI::International::getLanguage($self->session->user->profileField("language"),"languageAbbreviation"); + my $i18n = WebGUI::International->new($self->session); + my $language = $i18n->getLanguage($self->session->user->profileField("language"),"languageAbbreviation"); unless ($language) { - $language = WebGUI::International::getLanguage("English","languageAbbreviation"); + $language = $i18n->getLanguage("English","languageAbbreviation"); } $self->session->style->setScript($self->session->config->get("extrasURL").'/calendar/calendar.js',{ type=>'text/javascript' }); $self->session->style->setScript($self->session->config->get("extrasURL").'/calendar/lang/calendar-'.$language.'.js',{ type=>'text/javascript' }); $self->session->style->setScript($self->session->config->get("extrasURL").'/calendar/calendar-setup.js',{ type=>'text/javascript' }); $self->session->style->setLink($self->session->config->get("extrasURL").'/calendar/calendar-win2k-1.css', { rel=>"stylesheet", type=>"text/css", media=>"all" }); my $mondayFirst = $self->session->user->profileField("firstDayOfWeek") ? "true" : "false"; - return WebGUI::Form::Text->new( + return WebGUI::Form::Text->new($self->session, name=>$self->get("name"), value=>$value, size=>$self->get("size"), diff --git a/lib/WebGUI/Form/Interval.pm b/lib/WebGUI/Form/Interval.pm index d8604967b..41810ed4b 100644 --- a/lib/WebGUI/Form/Interval.pm +++ b/lib/WebGUI/Form/Interval.pm @@ -117,14 +117,14 @@ sub toHtml { # not sure why, but these things need to be defined like this or # they fail under some circumstnaces my $cmd = "WebGUI::Form::Integer"; - my $out = $cmd->new( + my $out = $cmd->new($self->session, name=>$self->get("name")."_interval", value=>$interval, extras=>$self->get("extras"), id=>$self->get('id')."_interval", )->toHtml; $cmd = "WebGUI::Form::SelectBox"; - $out .= $cmd->new( + $out .= $cmd->new($self->session, options=>\%units, name=>$self->get("name")."_units", id=>$self->get('id')."_units", @@ -145,11 +145,11 @@ Returns the field as hidden controls rather than displayable controls. sub toHtmlAsHidden { my $self = shift; my ($interval, $units) = $self->session->datetime->secondsToInterval($self->get("value")); - return WebGUI::Form::Hidden->new( + return WebGUI::Form::Hidden->new($self->session, name=>$self->get("name").'_interval', value=>$interval )->toHtmlAsHidden - .WebGUI::Form::Hidden->new( + .WebGUI::Form::Hidden->new($self->session, name=>$self->get("name").'_units', value=>$units )->toHtmlAsHidden; diff --git a/lib/WebGUI/Form/List.pm b/lib/WebGUI/Form/List.pm index c24667800..8749e9853 100644 --- a/lib/WebGUI/Form/List.pm +++ b/lib/WebGUI/Form/List.pm @@ -265,8 +265,7 @@ sub toHtmlAsHidden { foreach my $key (keys %options) { foreach my $item (@values) { if ($item eq $key) { - $output .= WebGUI::Form::Hidden->new( - $self->session, + $output .= WebGUI::Form::Hidden->new($self->session, name=>$self->get("name"), value=>$key )->toHtmlAsHidden; diff --git a/lib/WebGUI/Form/TimeField.pm b/lib/WebGUI/Form/TimeField.pm index df61a6da1..54b8a0679 100644 --- a/lib/WebGUI/Form/TimeField.pm +++ b/lib/WebGUI/Form/TimeField.pm @@ -112,8 +112,7 @@ sub toHtml { $self->session->style->setScript($self->session->config->get("extrasURL").'/inputCheck.js',{ type=>'text/javascript' }); $self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'0123456789:\')"'); return $self->SUPER::toHtml - .WebGUI::Form::Button->new( - $self->session, + .WebGUI::Form::Button->new($self->session, id=>$self->get('id'), extras=>'style="font-size: 8pt;" onclick="window.timeField = this.form.'.$self->get("name").';clockSet = window.open(\''.$self->session->config->get("extrasURL"). '/timeChooser.html\',\'timeChooser\',\'WIDTH=230,HEIGHT=100\');return false"', value=>$i18n->get(970) @@ -130,8 +129,7 @@ Renders the field as a hidden field. sub toHtmlAsHidden { my $self = shift; - return WebGUI::Form::Hidden->new( - $self->session, + return WebGUI::Form::Hidden->new($self->session, name=>$self->get("name"), value=>secondsToTime($self->get("value")) )->toHtmlAsHidden; diff --git a/lib/WebGUI/Form/YesNo.pm b/lib/WebGUI/Form/YesNo.pm index 204a30b9c..617152534 100644 --- a/lib/WebGUI/Form/YesNo.pm +++ b/lib/WebGUI/Form/YesNo.pm @@ -109,8 +109,7 @@ sub toHtml { } else { $checkNo = 1; } - my $output = WebGUI::Form::Radio->new( - $self->session, + my $output = WebGUI::Form::Radio->new($self->session, checked=>$checkYes, name=>$self->get("name"), value=>1, @@ -118,8 +117,7 @@ sub toHtml { )->toHtml; $output .= $i18n->get(138); $output .= '   '; - $output .= WebGUI::Form::Radio->new( - $self->session, + $output .= WebGUI::Form::Radio->new($self->session, checked=>$checkNo, name=>$self->get("name"), value=>0, diff --git a/lib/WebGUI/Operation/ProfileSettings.pm b/lib/WebGUI/Operation/ProfileSettings.pm index 4b1704db6..fd52a4ef1 100644 --- a/lib/WebGUI/Operation/ProfileSettings.pm +++ b/lib/WebGUI/Operation/ProfileSettings.pm @@ -202,7 +202,7 @@ sub www_editProfileField { next if $form eq 'DynamicField'; my $cmd = join '::', 'WebGUI::Form', $form; eval "use $cmd"; - my $w = eval "$cmd->new();"; + my $w = eval "$cmd->new($session);"; push @profileForms, $form if $w->{profileEnabled}; }