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

Fix the accidental overriding of www_export in the Thing. Fixes bug #12066.

Browse source
This commit is contained in:
Colin Kuskie 2011-03-04 10:45:06 -08:00
parent 675dfec848
commit 73a95e9627
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2727,13 +2727,13 @@ sub www_editThingDataSaveViaAjax {
#-------------------------------------------------------------------
=head2 www_export ( )
=head2 www_exportThing ( )
Exports search results as csv.
Exports one entire Thing as CSV.
=cut
sub www_export {
sub www_exportThing {
my $self = shift;
my $session = $self->session;
my ($query,$sth,$out,$fields,@fields,$fileName,@fieldLabels);
@ -3322,7 +3322,7 @@ sub getSearchTemplateVars {
$var->{"thing_label"} = $thingProperties->{label};
if ($self->hasPrivileges($thingProperties->{groupIdExport})){
$var->{"export_url"} = $session->url->append($url, 'func=export;thingId='.$thingId);
$var->{"export_url"} = $session->url->append($url, 'func=exportThing;thingId='.$thingId);
}
if ($self->hasPrivileges($thingProperties->{groupIdImport})){
$var->{"import_url"} = $session->url->append($url, 'func=importForm;thingId='.$thingId);

3
lib/WebGUI/i18n/English/Asset_Thingy.pm
View file

@ -929,8 +929,7 @@ below/after the form element.|,
},
'export_url' => {
message => q|Url to export the data in a search result into a csv file. This is only available after a
search has been done.|,
message => q|Url to export the all data in a thing into a csv file.|,
lastUpdated => 1104630516,
context => q|Description of a tmpl_var for the template help.|,
},