oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

converting WebGUI::Form API to use new session system

Browse source
This commit is contained in:
JT Smith 2006-01-10 17:43:38 +00:00
parent 9520b4ce48
commit 2599a4c853
28 changed files with 199 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/WebGUI/Asset/Post.pm
View file

@ -508,7 +508,7 @@ sub getUploadControl {
}
return $uploadControl unless ($i < $maxAttachments);
}
$uploadControl .= WebGUI::Form::file(
$uploadControl .= WebGUI::Form::file($self->session,
maxAttachments=>$maxAttachments
);
return $uploadControl;
@ -957,7 +957,7 @@ sub www_edit {
my $content;
my $title;
if ($self->session->form->process("func") eq "add") { # new post
$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getParent->getUrl})
$var{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getParent->getUrl})
.WebGUI::Form::hidden({
name=>"func",
value=>"add"
@ -1013,7 +1013,7 @@ sub www_edit {
$content .= "\n\n".$self->session->user->profileField("signature") if ($self->session->user->profileField("signature") && !$self->session->form->process("content"));
} else { # edit
return $self->session->privilege->insufficient() unless ($self->canEdit);
$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getUrl})
$var{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
.WebGUI::Form::hidden({
name=>"func",
value=>"edit"
@ -1038,7 +1038,7 @@ sub www_edit {
$var{'preview.userDefined'.$i} = WebGUI::HTML::filter($session{form}{'userDefined'.$i},"macros");
}
}
$var{'form.footer'} = WebGUI::Form::formFooter();
$var{'form.footer'} = WebGUI::Form::formFooter($self->session,);
$var{usePreview} = $self->getThread->getParent->get("usePreview");
$var{'user.isModerator'} = $self->getThread->getParent->canModerate;
$var{'user.isVisitor'} = ($self->session->user->profileField("userId") eq '1');

2
lib/WebGUI/Asset/Shortcut.pm
View file

@ -94,7 +94,7 @@ sub _drawQueryBuilder {
});
# The value select field
my $valFieldName = "val_field".$i;
my $valueField = WebGUI::Form::dynamicField(
my $valueField = WebGUI::Form::dynamicField($self->session,
fieldType=>$fieldType,
name=>$valFieldName,
uiLevel=>5,

14
lib/WebGUI/Asset/Template.pm
View file

@ -511,26 +511,26 @@ $style .= '
template=>$style
})->www_edit;
} else {
$output = WebGUI::Form::formHeader({action=>$self->getUrl}).WebGUI::Form::hidden({name=>"func", value=>"styleWizard"});
$output .= WebGUI::Form::hidden({name=>"proceed", value=>"manageAssets"}) if ($self->session->form->process("proceed"));
$output = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl}).WebGUI::Form::hidden({name=>"func", value=>"styleWizard"});
$output .= WebGUI::Form::hidden($self->session,{name=>"proceed", value=>"manageAssets"}) if ($self->session->form->process("proceed"));
$output .= '<style type="text/css">
.chooser { float: left; width: 150px; height: 150px; }
.representation, .representation td { font-size: 12px; width: 120px; border: 1px solid black; }
.representation { height: 130px; }
</style>';
$output .= "<p>Choose a layout for this style:</p>";
$output .= WebGUI::Form::hidden({name=>"step", value=>2});
$output .= '<div class="chooser">'.WebGUI::Form::radio({name=>"layout", value=>1, checked=>1}).q|<table class="representation"><tbody>
$output .= WebGUI::Form::hidden($self->session,{name=>"step", value=>2});
$output .= '<div class="chooser">'.WebGUI::Form::radio($self->session,{name=>"layout", value=>1, checked=>1}).q|<table class="representation"><tbody>
<tr><td>Logo</td><td>Heading</td></tr>
<tr><td>Menu</td><td>Body content goes here.</td></tr>
</tbody></table></div>|;
$output .= '<div class="chooser">'.WebGUI::Form::radio({name=>"layout", value=>2}).q|<table class="representation"><tbody>
$output .= '<div class="chooser">'.WebGUI::Form::radio($self->session,{name=>"layout", value=>2}).q|<table class="representation"><tbody>
<tr><td>Logo</td><td>Heading</td></tr>
<tr><td style="text-align: center;" colspan="2">Menu</td></tr>
<tr><td colspan="2">Body content goes here.</td></tr>
</tbody></table></div>|;
$output .= WebGUI::Form::submit();
$output .= WebGUI::Form::formFooter();
$output .= WebGUI::Form::submit($self->session,);
$output .= WebGUI::Form::formFooter($self->session,);
}
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=edit'),WebGUI::International::get("edit template","Asset_Template")) if ($self->get("url"));
return $self->getAdminConsole->render($output,WebGUI::International::get('style wizard', 'Asset_Template'));

10
lib/WebGUI/Asset/Wobject/Collaboration.pm
View file

@ -960,9 +960,9 @@ sub www_search {
$self->session->scratch->set($self->getId."_without",$self->session->form->process("without"));
$self->session->scratch->set($self->getId."_numResults",$self->session->form->process("numResults"));
my %var;
$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getUrl})
.WebGUI::Form::hidden({ name=>"func", value=>"search" })
.WebGUI::Form::hidden({ name=>"doit", value=>1 });
$var{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
.WebGUI::Form::hidden($self->session,{ name=>"func", value=>"search" })
.WebGUI::Form::hidden($self->session,{ name=>"doit", value=>1 });
$var{'all.form'} = WebGUI::Form::text({
name=>'all',
value=>$session{scratch}{$self->getId."_all"},
@ -992,8 +992,8 @@ sub www_search {
options=>\%results,
value=>[$numResults]
});
$var{'form.search'} = WebGUI::Form::submit({value=>WebGUI::International::get(170)});
$var{'form.footer'} = WebGUI::Form::formFooter();
$var{'form.search'} = WebGUI::Form::submit($self->session,{value=>WebGUI::International::get(170)});
$var{'form.footer'} = WebGUI::Form::formFooter($self->session,);
$var{'back.url'} = $self->getUrl;
$self->appendTemplateLabels(\%var);
$var{doit} = $self->session->form->process("doit");

12
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -385,14 +385,14 @@ sub getRecordTemplateVars {
$var->{"addTab.label"}= WebGUI::International::get(105,"Asset_DataForm");;
$var->{"addTab.url"}= $self->getUrl('func=editTab');
$var->{"tab.init"}= _createTabInit($self->getId);
$var->{"form.start"} = WebGUI::Form::formHeader({action=>$self->getUrl})
.WebGUI::Form::hidden({name=>"func",value=>"process"});
$var->{"form.start"} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
.WebGUI::Form::hidden($self->session,{name=>"func",value=>"process"});
my @tabs;
my $select = "select a.name, a.DataForm_fieldId, a.DataForm_tabId,a.label, a.status, a.isMailField, a.subtext, a.type, a.defaultValue, a.possibleValues, a.width, a.rows, a.extras, a.vertical";
my $join;
my $where = "where a.assetId=".$self->session->db->quote($self->getId);
if ($var->{entryId}) {
$var->{"form.start"} .= WebGUI::Form::hidden({name=>"entryId",value=>$var->{entryId}});
$var->{"form.start"} .= WebGUI::Form::hidden($self->session,{name=>"entryId",value=>$var->{entryId}});
my $entry = $self->getCollateral("DataForm_entry","DataForm_entryId",$var->{entryId});
$var->{ipAddress} = $entry->{ipAddress};
$var->{username} = $entry->{username};
@ -494,9 +494,9 @@ sub getRecordTemplateVars {
$var->{field_loop} = \@fields;
$tabsth->finish;
$var->{tab_loop} = \@tabs;
$var->{"form.send"} = WebGUI::Form::submit({value=>WebGUI::International::get(73, "Asset_DataForm")});
$var->{"form.save"} = WebGUI::Form::submit();
$var->{"form.end"} = WebGUI::Form::formFooter();
$var->{"form.send"} = WebGUI::Form::submit($self->session,{value=>WebGUI::International::get(73, "Asset_DataForm")});
$var->{"form.save"} = WebGUI::Form::submit($self->session,);
$var->{"form.end"} = WebGUI::Form::formFooter($self->session,);
return $var;
}

2
lib/WebGUI/Asset/Wobject/IndexedSearch.pm
View file

@ -236,7 +236,7 @@ sub view {
$var{query} = $query;
# Set some standard vars
$var{submit} = WebGUI::Form::submit({value=>WebGUI::International::get(16, "Asset_IndexedSearch")});
$var{submit} = WebGUI::Form::submit($self->session,{value=>WebGUI::International::get(16, "Asset_IndexedSearch")});
$var{actionURL} = $self->getUrl;
$var{"int.search"} = WebGUI::International::get(16,"Asset_IndexedSearch");
$var{numberOfResults} = '0';

4
lib/WebGUI/Asset/Wobject/Matrix.pm
View file

@ -117,7 +117,7 @@ sub getCategories {
sub getCompareForm {
my $self = shift;
my @ids = @_;
my $form = WebGUI::Form::formHeader({action=>$self->getUrl})
my $form = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
.WebGUI::Form::submit({
value=>"compare"
})
@ -804,7 +804,7 @@ sub www_search {
}
}
$var{'compare.form'} = $self->getCompareForm(@list);
$var{'form.header'} = WebGUI::Form::formHeader({action=>$self->getUrl})
$var{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
.WebGUI::Form::hidden({
name=>"doit",
value=>"1"

10
lib/WebGUI/Asset/Wobject/Poll.pm
View file

@ -293,17 +293,17 @@ sub view {
my ($totalResponses) = $self->session->db->quickArray("select count(*) from Poll_answer where assetId=".$self->session->db->quote($self->getId));
$var{"responses.label"} = WebGUI::International::get(12,"Asset_Poll");
$var{"responses.total"} = $totalResponses;
$var{"form.start"} = WebGUI::Form::formHeader({action=>$self->getUrl});
$var{"form.start"} .= WebGUI::Form::hidden({name=>'func',value=>'vote'});
$var{"form.submit"} = WebGUI::Form::submit({value=>WebGUI::International::get(11,"Asset_Poll")});
$var{"form.end"} = WebGUI::Form::formFooter();
$var{"form.start"} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl});
$var{"form.start"} .= WebGUI::Form::hidden($self->session,{name=>'func',value=>'vote'});
$var{"form.submit"} = WebGUI::Form::submit($self->session,{value=>WebGUI::International::get(11,"Asset_Poll")});
$var{"form.end"} = WebGUI::Form::formFooter($self->session,);
$totalResponses = 1 if ($totalResponses < 1);
for (my $i=1; $i<=20; $i++) {
if ($self->get('a'.$i) =~ /\C/) {
my ($tally) = $self->session->db->quickArray("select count(*) from Poll_answer where answer='a"
.$i."' and assetId=".$self->session->db->quote($self->getId)." group by answer");
push(@answers,{
"answer.form"=>WebGUI::Form::radio({name=>"answer",value=>"a".$i}),
"answer.form"=>WebGUI::Form::radio($self->session,{name=>"answer",value=>"a".$i}),
"answer.text"=>$self->get('a'.$i),
"answer.graphWidth"=>round($self->get("graphWidth")*$tally/$totalResponses),
"answer.number"=>$i,

4
lib/WebGUI/Asset/Wobject/Survey.pm
View file

@ -670,12 +670,12 @@ sub view {
$var->{question_loop} = $self->getQuestionsLoop($var->{'response.Id'});
}
}
$var->{'form.header'} = WebGUI::Form::formHeader({action=>$self->getUrl})
$var->{'form.header'} = WebGUI::Form::formHeader($self->session,{action=>$self->getUrl})
.WebGUI::Form::hidden({
name=>'func',
value=>'respond'
});
$var->{'form.footer'} = WebGUI::Form::formFooter();
$var->{'form.footer'} = WebGUI::Form::formFooter($self->session,);
$var->{'form.submit'} = WebGUI::Form::submit({
value=>WebGUI::International::get(50,'Asset_Survey')
});