- Removed duplicate processing of metadata.
- fix [ 1373649 ] Username isn't populated in 6.8.0 Discussions
This commit is contained in:
parent
4c356dbab5
commit
49212c2b44
3 changed files with 3 additions and 21 deletions
|
|
@ -1,4 +1,6 @@
|
||||||
6.8.1
|
6.8.1
|
||||||
|
- Removed duplicate processing of metadata.
|
||||||
|
- fix [ 1373649 ] Username isn't populated in 6.8.0 Discussions
|
||||||
- Upgraded TinyMCE to 2.0.1, which allows the rich editor to work with
|
- Upgraded TinyMCE to 2.0.1, which allows the rich editor to work with
|
||||||
Firefox 1.5.
|
Firefox 1.5.
|
||||||
- Added test class for User.pm (Roy Johnson / Ocean View Web Creations)
|
- Added test class for User.pm (Roy Johnson / Ocean View Web Creations)
|
||||||
|
|
|
||||||
|
|
@ -1168,27 +1168,6 @@ sub processPropertiesFromFormPost {
|
||||||
}
|
}
|
||||||
WebGUI::SQL->beginTransaction;
|
WebGUI::SQL->beginTransaction;
|
||||||
$self->update(\%data);
|
$self->update(\%data);
|
||||||
foreach my $form (keys %{$session{form}}) {
|
|
||||||
if ($form =~ /^metadata_(.*)$/) {
|
|
||||||
my $fieldId = $1;
|
|
||||||
my ($exists) = WebGUI::SQL->quickArray("select count(*) from metaData_values
|
|
||||||
where assetId = ".quote($self->getId)."
|
|
||||||
and fieldId = ".quote($fieldId));
|
|
||||||
if(! $exists && $session{form}{$form} ne "") {
|
|
||||||
WebGUI::SQL->write("insert into metaData_values (fieldId, assetId)
|
|
||||||
values (".quote($fieldId).",".quote($self->getId).")");
|
|
||||||
}
|
|
||||||
if($session{form}{$form} eq "") {
|
|
||||||
# Keep it clean
|
|
||||||
WebGUI::SQL->write("delete from metaData_values where assetId = ".
|
|
||||||
quote($self->getId)." and fieldId = ".quote($fieldId));
|
|
||||||
} else {
|
|
||||||
WebGUI::SQL->write("update metaData_values set value = ".quote($session{form}{$form})."
|
|
||||||
where assetId = ".quote($self->getId)." and fieldId = ".
|
|
||||||
quote($fieldId));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
WebGUI::SQL->commit;
|
WebGUI::SQL->commit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -625,6 +625,7 @@ sub processPropertiesFromFormPost {
|
||||||
}
|
}
|
||||||
%data = (
|
%data = (
|
||||||
ownerUserId => $session{user}{userId},
|
ownerUserId => $session{user}{userId},
|
||||||
|
username => $session{form}{visitorName} || $session{user}{alias} || $session{user}{username},
|
||||||
isHidden => 1,
|
isHidden => 1,
|
||||||
dateSubmitted=>time()
|
dateSubmitted=>time()
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue