Fixed a bug in the USS code related to the new wobject API.
This commit is contained in:
parent
c3c06514f3
commit
8023b83436
2 changed files with 7 additions and 25 deletions
|
|
@ -1300,15 +1300,15 @@ A hash reference of extra properties to set.
|
|||
sub www_editSave {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
|
||||
my %set;
|
||||
foreach (keys %{$_[0]->{_wobjectProperties}}) {
|
||||
if (exists $session{form}{$_}) {
|
||||
$set{$_} = _validateField($_,$_[0]->{_wobjectProperties}{$_}{fieldType}) || $_[0]->{_wobjectProperties}{$_}{defaultValue};
|
||||
foreach my $key (keys %{$_[0]->{_wobjectProperties}}) {
|
||||
if (exists $session{form}{$key}) {
|
||||
$set{$key} = _validateField($key,$_[0]->{_wobjectProperties}{$key}{fieldType}) || $_[0]->{_wobjectProperties}{$key}{defaultValue};
|
||||
}
|
||||
}
|
||||
$set{title} = $session{form}{title} || $_[0]->name;
|
||||
foreach (keys %{$_[0]->{_extendedProperties}}) {
|
||||
if (exists $session{form}{$_}) {
|
||||
$set{$_} = _validateField($_,$_[0]->{_extendedProperties}{$_}{fieldType}) || $_[0]->{_extendedProperties}{$_}{defaultValue};
|
||||
foreach my $key (keys %{$_[0]->{_extendedProperties}}) {
|
||||
if (exists $session{form}{$key}) {
|
||||
$set{$key} = _validateField($key,$_[0]->{_extendedProperties}{$key}{fieldType}) || $_[0]->{_extendedProperties}{$key}{defaultValue};
|
||||
}
|
||||
}
|
||||
%set = (%set, %{$_[1]});
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ sub new {
|
|||
my $property = shift;
|
||||
my $self = WebGUI::Wobject->new(
|
||||
-properties=>$property,
|
||||
-useDiscussion=>1<
|
||||
-useDiscussion=>1,
|
||||
-extendedProperties=>{
|
||||
submissionsPerPage=>{
|
||||
defaultValue=>50
|
||||
|
|
@ -87,9 +87,6 @@ sub new {
|
|||
karmaPerSubmission=>{
|
||||
defaultValue=>0
|
||||
},
|
||||
allowDiscussion=>{
|
||||
defaultValue=>0
|
||||
},
|
||||
filterContent=>{
|
||||
defaultValue=>"javascript"
|
||||
}
|
||||
|
|
@ -252,21 +249,6 @@ sub www_edit {
|
|||
);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_editSave {
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
|
||||
$_[0]->SUPER::www_editSave({
|
||||
submissionsPerPage=>$session{form}{submissionsPerPage},
|
||||
groupToContribute=>$session{form}{groupToContribute},
|
||||
groupToApprove=>$session{form}{groupToApprove},
|
||||
defaultStatus=>$session{form}{defaultStatus},
|
||||
karmaPerSubmission=>$session{form}{karmaPerSubmission},
|
||||
templateId=>$session{form}{templateId},
|
||||
submissionTemplateId=>$session{form}{submissionTemplateId},
|
||||
filterContent=>$session{form}{filterContent}
|
||||
});
|
||||
return "";
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub www_editSubmission {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue