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

fixed: Thingy Data now retains File and Image unless explicitly deleted

Browse source
This commit is contained in:
Doug Bell 2008-06-20 17:19:14 +00:00
parent f8b9098991
commit fb81e7d67b
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -1,5 +1,6 @@
7.5.14 7.5.14
- fixed: Non-admin users can now add Gallery assets - fixed: Non-admin users can now add Gallery assets
- fixed: Thingy Data now retains File and Images if they aren't explicitly deleted
7.5.13 7.5.13
- fixed: storage locations for some assets in packages not imported correctly - fixed: storage locations for some assets in packages not imported correctly

24
lib/WebGUI/Asset/Wobject/Thingy.pm
View file

@ -1856,17 +1856,22 @@ sub www_editThingDataSave {
} }
return $session->privilege->insufficient() unless $self->hasPrivileges($privilegedGroup); return $session->privilege->insufficient() unless $self->hasPrivileges($privilegedGroup);
%thingData = (
thingDataId=>$thingDataId,
updatedById=>$session->user->userId,
updatedByName=>$session->user->username,
lastUpDated=>time(),
);
if ($thingDataId eq "new"){ if ($thingDataId eq "new"){
$thingData{dateCreated} = time(); $thingData{dateCreated} = time();
$thingData{createdById} = $session->user->userId; $thingData{createdById} = $session->user->userId;
$thingData{ipAddress} = $session->env->getIp; $thingData{ipAddress} = $session->env->getIp;
} }
else {
%thingData = $session->db->quickHash("select * from ".$session->db->dbh->quote_identifier("Thingy_".$thingId)
." where thingDataId = ?",[$thingDataId]);
}
%thingData = ( %thingData,
thingDataId=>$thingDataId,
updatedById=>$session->user->userId,
updatedByName=>$session->user->username,
lastUpDated=>time(),
);
$fields = $session->db->read('select * from Thingy_fields where assetId = '.$session->db->quote($self->get("assetId")).' and thingId = '.$session->db->quote($thingId).' order by sequenceNumber'); $fields = $session->db->read('select * from Thingy_fields where assetId = '.$session->db->quote($self->get("assetId")).' and thingId = '.$session->db->quote($thingId).' order by sequenceNumber');
while (my $field = $fields->hashRef) { while (my $field = $fields->hashRef) {
@ -1875,7 +1880,12 @@ sub www_editThingDataSave {
if ($field->{status} eq "required" || $field->{status} eq "editable"){ if ($field->{status} eq "required" || $field->{status} eq "editable"){
my $fieldType = $field->{fieldType}; my $fieldType = $field->{fieldType};
$fieldType = "" if ($fieldType =~ m/^otherThing/x); $fieldType = "" if ($fieldType =~ m/^otherThing/x);
$fieldValue = $session->form->process($fieldName,$fieldType,$field->{defaultValue}); # Modify the defaultValue for certain field types. For most types we want to use
# the default in the database, for these we want the last known value for this thingData
if ( $fieldType eq "File" || $fieldType eq "Image" ) {
$field->{ defaultValue } = $thingData{ "field_" . $field->{ fieldId } };
}
$fieldValue = $session->form->process($fieldName,$fieldType,$field->{defaultValue},$field);
} }
if ($field->{status} eq "required" && ($fieldValue =~ /^\s$/x || $fieldValue eq "" || !(defined $fieldValue))) { if ($field->{status} eq "required" && ($fieldValue =~ /^\s$/x || $fieldValue eq "" || !(defined $fieldValue))) {
push (@errors,{ push (@errors,{