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

fixed: Thingy: field type includes things without fields

Browse source
This commit is contained in:
Yung Han Khoe 2008-03-27 13:47:08 +00:00
parent e862cb8303
commit f584a12273
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,6 +25,7 @@
- fixed: Syndicated Content picks wrong entries for interleaving - fixed: Syndicated Content picks wrong entries for interleaving
- fixed: Syndicated Content URLs using macros not updated by caching workflow - fixed: Syndicated Content URLs using macros not updated by caching workflow
- fixed: Syndicated Content asset tries too hard to get URLs returning errors - fixed: Syndicated Content asset tries too hard to get URLs returning errors
- fixed: Thingy: field type includes things without fields
- fix: Users now have permission to add comments - fix: Users now have permission to add comments
- fix: Username for comment poster is now shown correctly - fix: Username for comment poster is now shown correctly
- fix: Slideshow now works - fix: Slideshow now works

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

@ -372,7 +372,9 @@ sub getEditFieldForm {
$fieldTypes{$fieldType} = $form->getName($self->session); $fieldTypes{$fieldType} = $form->getName($self->session);
} }
$things = $self->session->db->read('select thingId, label from Thingy_things where assetId =?',[$self->getId]); $things = $self->session->db->read('select thingId, Thingy_things.label, count(*) from Thingy_things '
.'left join Thingy_fields using(thingId) where Thingy_things.assetId = ? and fieldId != "" '
.'group by thingId',[$self->getId]);
while (my $thing = $things->hashRef) { while (my $thing = $things->hashRef) {
my $fieldType = "otherThing_".$thing->{thingId}; my $fieldType = "otherThing_".$thing->{thingId};
$fieldTypes{$fieldType} = $thing->{label}; $fieldTypes{$fieldType} = $thing->{label};

3
www/extras/wobject/Thingy/thingy.js
View file

@ -87,7 +87,8 @@ function initOptionalFields(prefix,fieldId) {
if (fieldInThing_module_rendered == thingId){ if (fieldInThing_module_rendered == thingId){
fieldInThing_module.show(); fieldInThing_module.show();
}else{ defaultFieldInThing_module.show();
}else{
var url = location.pathname + "?func=selectFieldInThing;thingId=" + thingId + ";prefix=" +prefix + ";fieldId=" + fieldId; var url = location.pathname + "?func=selectFieldInThing;thingId=" + thingId + ";prefix=" +prefix + ";fieldId=" + fieldId;
var handleSuccess = function(o){ var handleSuccess = function(o){
fieldInThing_module.setBody(o.responseText); fieldInThing_module.setBody(o.responseText);