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

Fix test failures

Browse source
This commit is contained in:
Graham Knop 2008-03-13 22:08:24 +00:00
parent 9e3094e05a
commit cef5f68603
2 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,11 +28,11 @@ our $VERSION = "1.0.0";
Adds a new field. Adds a new field.
=head3 =head3 field
A hashref containing the properties of the new field. A hashref containing the properties of the new field.
=head3 =head3 retainIds
If retainIds is true the new field will keep the fieldId and assetId in the properties hashref. The thingId is If retainIds is true the new field will keep the fieldId and assetId in the properties hashref. The thingId is
always taken from the field hashref. always taken from the field hashref.
@ -84,11 +84,11 @@ sub addField {
Adds a new thing. Adds a new thing.
=head3 =head3 thing
A hashref containing the properties of the new thing. A hashref containing the properties of the new thing.
=head3 =head3 retainIds
If retainIds is true the new thing will keep the thingId and assetId in the properties hashref. If retainIds is true the new thing will keep the thingId and assetId in the properties hashref.
@ -529,6 +529,7 @@ sub getEditForm {
return $tabform; return $tabform;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 getFieldValue ( value, field ) =head2 getFieldValue ( value, field )
@ -539,7 +540,7 @@ Processes the field value for date(Time) fields and Other Thing fields.
The value as stored in the database. The value as stored in the database.
=head field =head3 field
A reference to a hash containing the fields properties. A reference to a hash containing the fields properties.
@ -1573,7 +1574,9 @@ sub www_editFieldSave {
$session->output->print($newFieldId.$listItemHTML); $session->output->print($newFieldId.$listItemHTML);
return "chunked"; return "chunked";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 www_editThingData ( ) =head2 www_editThingData ( )
Shows a form to edit a things data. Shows a form to edit a things data.
@ -1668,7 +1671,9 @@ sequenceNumber');
return $self->processTemplate($var,$thingProperties{editTemplateId}); return $self->processTemplate($var,$thingProperties{editTemplateId});
} }
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 www_editThingDataSave ( ) =head2 www_editThingDataSave ( )
Processes and saves data for a Thing. Processes and saves data for a Thing.
@ -1771,6 +1776,7 @@ thingId=".$session->db->quote($thingId));
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 www_export ( ) =head2 www_export ( )
Exports search results as csv. Exports search results as csv.
@ -1825,7 +1831,9 @@ sub www_export {
return $out; return $out;
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 www_import ( ) =head2 www_import ( )
Imports data from a .csv file. Imports data from a .csv file.
@ -1948,7 +1956,9 @@ thingId=".$session->db->quote($thingId));
return $self->www_search($thingId); return $self->www_search($thingId);
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 www_importForm ( ) =head2 www_importForm ( )
Shows the import screen. Shows the import screen.
@ -2025,8 +2035,8 @@ sub www_importForm {
return $self->session->style->process($output,$self->get("styleTemplateId")); return $self->session->style->process($output,$self->get("styleTemplateId"));
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 www_manage ( ) =head2 www_manage ( )
Shows the screen to manage things in a Thingy. Shows the screen to manage things in a Thingy.
@ -2134,6 +2144,7 @@ sub www_moveFieldConfirm {
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 www_search ( ) =head2 www_search ( )
Shows the search screen and performs the search. Shows the search screen and performs the search.
@ -2295,7 +2306,9 @@ sequenceNumber');
return $self->processTemplate($var,$thingProperties{searchTemplateId}); return $self->processTemplate($var,$thingProperties{searchTemplateId});
} }
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 www_selectDefaultFieldValue ( ) =head2 www_selectDefaultFieldValue ( )
Returns a form element to select a field in a thing. Returns a form element to select a field in a thing.
@ -2347,7 +2360,9 @@ sub www_selectDefaultFieldValue {
return "chunked"; return "chunked";
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 www_selectFieldInThing ( ) =head2 www_selectFieldInThing ( )
Returns a form element to select a field in a thing. Returns a form element to select a field in a thing.
@ -2394,6 +2409,7 @@ sub www_selectFieldInThing {
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 www_viewThingData ( ) =head2 www_viewThingData ( )
Shows the view screen of a Thing Shows the view screen of a Thing
@ -2449,8 +2465,7 @@ sequenceNumber');
if ($field{fieldType} =~ m/^otherThing/x) { if ($field{fieldType} =~ m/^otherThing/x) {
my $otherThingId = $field{fieldType}; my $otherThingId = $field{fieldType};
$otherThingId =~ s/^otherThing_//x; $otherThingId =~ s/^otherThing_//x;
my ($groupIdView) = $session->db->quickArray("select groupIdView from Thingy_things where thingId my ($groupIdView) = $session->db->quickArray("select groupIdView from Thingy_things where thingId=?",[$otherThingId]);
=?",[$otherThingId]);
if($self->hasPrivileges($groupIdView)){ if($self->hasPrivileges($groupIdView)){
$otherThingUrl = $session->url->append($url,"func=viewThingData;thingId=$otherThingId;thingDataId=$originalValue"); $otherThingUrl = $session->url->append($url,"func=viewThingData;thingId=$otherThingId;thingDataId=$originalValue");
} }

2
t/Asset/Event.t
View file

@ -52,7 +52,7 @@ is($event->isAllDay, 0, 'isAllDay is zero since it has a start and end time');
my %templateVars = $event->getTemplateVars(); my %templateVars = $event->getTemplateVars();
is($templateVars{isOneDay}, 1, 'getTemplateVars: isOneDay with start times'); is($templateVars{isOneDay}, 1, 'getTemplateVars: isOneDay with start times');
is($templateVars{dateSpan}, 'Wednesday, August 16 6:00 PM ‐ 10:00 PM', 'getTemplateVars: dateSpan bridges times on a single day'); is($templateVars{dateSpan}, 'Wednesday, August 16 6:00 PM – 10:00 PM', 'getTemplateVars: dateSpan bridges times on a single day');
$properties->{startDate} = '2000-08-16'; $properties->{startDate} = '2000-08-16';
$properties->{endDate} = '2000-08-16'; $properties->{endDate} = '2000-08-16';