diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index a4299c960..2d4fa84b8 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -19,6 +19,10 @@ - fixed lots of XHTML bugs in templates and code - fix [ 1301604 ] Survey in 6.7.5 gamma - fix [ 1310360 ] WebGUI::FormProcessor::checkbox not working correctly + - Finally Internationalized some of the www_edit screens for wobjects, + by adding a generic www_edit generator in Wobject.pm. + - Fixed a lot of the www_ methods in Survey.pm to return in styled pages + instead of raw

tags without etc 6.7.6 diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm index 4e0dd7325..be99f2e3a 100644 --- a/lib/WebGUI/Asset/Wobject/Article.pm +++ b/lib/WebGUI/Asset/Wobject/Article.pm @@ -175,12 +175,12 @@ sub view { #------------------------------------------------------------------- -sub www_edit { - my $self = shift; - return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("article add/edit","Asset_Article"); - return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","Asset_Article")); -} +#sub www_edit { +# my $self = shift; +# return WebGUI::Privilege::insufficient() unless $self->canEdit; +# $self->getAdminConsole->setHelp("article add/edit","Asset_Article"); +# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","Asset_Article")); +#} diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index cc30a85b1..6b8109e51 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -921,12 +921,12 @@ sub view { } #------------------------------------------------------------------- -sub www_edit { - my $self = shift; - return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("collaboration add/edit", "Asset_Collaboration"); - return $self->getAdminConsole->render($self->getEditForm->print,"Edit Collaboration System"); -} +#sub www_edit { +# my $self = shift; +# return WebGUI::Privilege::insufficient() unless $self->canEdit; +# $self->getAdminConsole->setHelp("collaboration add/edit", "Asset_Collaboration"); +# return $self->getAdminConsole->render($self->getEditForm->print,"Edit Collaboration System"); +#} #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm index 5a05f54a0..4ae15b646 100644 --- a/lib/WebGUI/Asset/Wobject/DataForm.pm +++ b/lib/WebGUI/Asset/Wobject/DataForm.pm @@ -739,12 +739,12 @@ sub www_deleteTabConfirm { } #------------------------------------------------------------------- -sub www_edit { - my $self = shift; - return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("data form add/edit","Asset_DataForm"); - return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("7","Asset_DataForm")); -} +#sub www_edit { +# my $self = shift; +# return WebGUI::Privilege::insufficient() unless $self->canEdit; +# $self->getAdminConsole->setHelp("data form add/edit","Asset_DataForm"); +# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("7","Asset_DataForm")); +#} #------------------------------------------------------------------- sub www_editField { diff --git a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm index 588eeb6ab..5275765c9 100644 --- a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm +++ b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm @@ -428,12 +428,12 @@ sub view { } #------------------------------------------------------------------- -sub www_edit { - my $self = shift; - return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("events calendar add/edit","Asset_EventsCalendar"); - return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","Asset_EventsCalendar")); -} +#sub www_edit { +# my $self = shift; +# return WebGUI::Privilege::insufficient() unless $self->canEdit; +# $self->getAdminConsole->setHelp("events calendar add/edit","Asset_EventsCalendar"); +# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","Asset_EventsCalendar")); +#} 1; diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm index b5f1c085d..baa82a71d 100644 --- a/lib/WebGUI/Asset/Wobject/Folder.pm +++ b/lib/WebGUI/Asset/Wobject/Folder.pm @@ -148,12 +148,12 @@ sub view { } -sub www_edit { - my $self = shift; - return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("folder add/edit","Asset_Folder"); - return $self->getAdminConsole->render($self->getEditForm->print,"Edit Folder"); -} +#sub www_edit { +# my $self = shift; +# return WebGUI::Privilege::insufficient() unless $self->canEdit; +# $self->getAdminConsole->setHelp("folder add/edit","Asset_Folder"); +# return $self->getAdminConsole->render($self->getEditForm->print,"Edit Folder"); +#} diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm index d7fc24ab3..75ffcc9ad 100644 --- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm +++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm @@ -341,12 +341,12 @@ sub view { #------------------------------------------------------------------- -sub www_edit { - my $self = shift; - return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("http proxy add/edit","Asset_HttpProxy"); - return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("2","Asset_HttpProxy")); -} +#sub www_edit { +# my $self = shift; +# return WebGUI::Privilege::insufficient() unless $self->canEdit; +# $self->getAdminConsole->setHelp("http proxy add/edit","Asset_HttpProxy"); +# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("2","Asset_HttpProxy")); +#} #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index dae0d1a04..7c19c53e0 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -18,6 +18,7 @@ use WebGUI::HTMLForm; use WebGUI::HTTP; use WebGUI::Icon; use WebGUI::Id; +use WebGUI::Style; use WebGUI::International; use WebGUI::Privilege; use WebGUI::Session; @@ -768,8 +769,8 @@ sub www_deleteSectionConfirm { #------------------------------------------------------------------- sub www_deleteResponse { return "" unless (WebGUI::Grouping::isInGroup($_[0]->get("groupToViewReports"))); - return $_[0]->confirm(WebGUI::International::get(72,'Asset_Survey'), - $_[0]->getUrl('func=deleteResponseConfirm;responseId='.$session{form}{responseId})); + return WebGUI::Style::process($_[0]->confirm(WebGUI::International::get(72,'Asset_Survey'), + $_[0]->getUrl('func=deleteResponseConfirm;responseId='.$session{form}{responseId})),$_[0]->getValue("styleTemplateId")); } #------------------------------------------------------------------- @@ -783,8 +784,7 @@ sub www_deleteResponseConfirm { #------------------------------------------------------------------- sub www_deleteAllResponses { return "" unless (WebGUI::Grouping::isInGroup($_[0]->get("groupToViewReports"))); - return $_[0]->confirm(WebGUI::International::get(74,'Asset_Survey'), - $_[0]->getUrl('func=deleteAllResponsesConfirm')); + return WebGUI::Style::process($_[0]->confirm(WebGUI::International::get(74,'Asset_Survey'),$_[0]->getUrl('func=deleteAllResponsesConfirm')),$_[0]->getValue("styleTemplateId")); } #------------------------------------------------------------------- @@ -1234,6 +1234,18 @@ sub www_respond { } +#------------------------------------------------------------------- +=head2 www_view ( ) + +Overwrite www_view method and call the superclass object, passing in a 1 to disable cache + +=cut + +sub www_view { + my $self = shift; + $self->SUPER::www_view(1); +} + #------------------------------------------------------------------- sub www_viewGradebook { my $self = shift; @@ -1266,7 +1278,7 @@ sub www_viewGradebook { } $var->{response_loop} = \@responseloop; $p->appendTemplateVars($var); - return $self->processTemplate($var,$self->getValue("gradebookTemplateId")); + return WebGUI::Style::process($self->processTemplate($var,$self->getValue("gradebookTemplateId")),$self->getValue("styleTemplateId")); # return $self->processTemplate($self->getValue("gradebookTemplateId"),$var,"Survey/Gradebook"); } @@ -1326,7 +1338,7 @@ sub www_viewIndividualSurvey { } $a->finish; $var->{question_loop} = \@questionloop; - return $self->processTemplate($var, $self->getValue("responseTemplateId")); + return WebGUI::Style::process($self->processTemplate($var, $self->getValue("responseTemplateId")),$self->getValue("styleTemplateId")); # return $self->processTemplate($self->getValue("responseTemplateId"),$var,"Survey/Response"); } @@ -1400,7 +1412,7 @@ sub www_viewStatisticalOverview { $var->{question_loop} = \@questionloop; $p->appendTemplateVars($var); - return $self->processTemplate($var, $self->getValue("overviewTemplateId")); + return WebGUI::Style::process($self->processTemplate($var, $self->getValue("overviewTemplateId")),$self->getValue("styleTemplateId")); } 1;