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

merging back with HEAD

Browse source
This commit is contained in:
Colin Kuskie 2009-02-27 06:06:05 +00:00
parent cd30eb437c
commit f8b11b5423
42 changed files with 1201 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -484,9 +484,7 @@ sub deleteAttachedFiles {
my $form = $self->_createForm($fieldConfig->{$field}, $entryData->{$field});
if ($form->can('getStorageLocation')) {
my $storage = $form->getStorageLocation;
if ($storage) {
$storage->delete;
}
$storage->delete if $storage;
}
}
}
@ -498,7 +496,7 @@ sub deleteAttachedFiles {
my $form = $self->_createForm($fieldConfig->{$field}, $entryData->{$field});
if ($form->can('getStorageLocation')) {
my $storage = $form->getStorageLocation;
$storage->delete;
$storage->delete if $storage;
}
}
}

5
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
View file

@ -647,7 +647,8 @@ sub prepareView {
= WebGUI::Asset::Template->new($self->session, $templateId);
$template->prepare($self->getMetaDataAsTemplateVariables);
$self->{_viewTemplate} = $template;
$self->{_viewTemplate} = $template;
$self->{_viewVariables} = $self->getTemplateVars;
}
#----------------------------------------------------------------------------
@ -776,7 +777,7 @@ to be displayed within the page style.
sub view {
my $self = shift;
my $session = $self->session;
my $var = $self->getTemplateVars;
my $var = delete $self->{_viewVariables};
my $p = $self->getFilePaginator;
$p->appendTemplateVars( $var );

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

@ -98,70 +98,80 @@ sub definition {
maxResponsesPerUser => {
fieldType => 'integer',
defaultValue => 1,
label => 'Max user reponses',
label => $i18n->get('Max user responses'),
hoverHelp => $i18n->get('Max user responses help'),
},
overviewTemplateId => {
tab => 'display',
fieldType => 'template',
defaultValue => 'PBtmpl0000000000000063',
label => 'Overview template id',
namespace => 'Survey/Overview',
label => $i18n->get('Survey Overview Template'),
hoverHelp => $i18n->get('Survey Overview Template help'),
},
gradebookTemplateId => {
tab => 'display',
fieldType => 'template',
label => 'Grabebook template id',
defaultValue => 'PBtmpl0000000000000062',
namespace => 'Survey/Gradebook',
label => $i18n->get('Gradebook Template'),
hoverHelp => $i18n->get('Gradebook Template help'),
},
responseTemplateId => {
tab => 'display',
fieldType => 'template',
label => 'Response template id',
defaultValue => 'PBtmpl0000000000000064',
namespace => 'Survey/Response',
label => $i18n->get('Response Template'),
hoverHelp => $i18n->get('Response Template help'),
},
surveyEditTemplateId => {
tab => 'display',
fieldType => 'template',
label => 'Survey edit template id',
defaultValue => 'GRUNFctldUgop-qRLuo_DA',
namespace => 'Survey/Edit',
label => $i18n->get('Edit Survey Template'),
hoverHelp => $i18n->get('Edit Survey Template help'),
},
surveyTakeTemplateId => {
tab => 'display',
fieldType => 'template',
label => 'Take survey template id',
defaultValue => 'd8jMMMRddSQ7twP4l1ZSIw',
namespace => 'Survey/Take',
label => $i18n->get('Take Survey Template'),
hoverHelp => $i18n->get('Take Survey Template help'),
},
surveyQuestionsId => {
tab => 'display',
fieldType => 'template',
label => 'Questions template id',
defaultValue => 'CxMpE_UPauZA3p8jdrOABw',
namespace => 'Survey/Take',
label => $i18n->get('Questions Template'),
hoverHelp => $i18n->get('Questions Template help'),
},
sectionEditTemplateId => {
tab => 'display',
fieldType => 'template',
label => 'Section Edit Tempalte',
defaultValue => '1oBRscNIcFOI-pETrCOspA',
namespace => 'Survey/Edit',
label => $i18n->get('Section Edit Template'),
hoverHelp => $i18n->get('Section Edit Template help'),
},
questionEditTemplateId => {
tab => 'display',
fieldType => 'template',
label => 'Question Edit Tempalte',
defaultValue => 'wAc4azJViVTpo-2NYOXWvg',
namespace => 'Survey/Edit',
label => $i18n->get('Question Edit Template'),
hoverHelp => $i18n->get('Question Edit Template help'),
},
answerEditTemplateId => {
tab => 'display',
fieldType => 'template',
label => 'Answer Edit Tempalte',
defaultValue => 'AjhlNO3wZvN5k4i4qioWcg',
namespace => 'Survey/Edit',
label => $i18n->get('Answer Edit Template'),
hoverHelp => $i18n->get('Answer Edit Template help'),
},
);

2
lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
View file

@ -785,7 +785,7 @@ sub updateQuestionAnswers {
}
elsif ( $type eq 'Party' ) {
my @ans
= ( 'Democratic party', 'Republican party (or GOP)', 'Independant party', 'Other party (verbatim)' );
= ( 'Democratic party', 'Republican party (or GOP)', 'Independent party', 'Other party (verbatim)' );
$self->addAnswersToQuestion( \@addy, \@ans, { 3, 1 } );
}
elsif ( $type eq 'Race' ) {