diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 0729f7ef1..c067ca939 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,6 @@ 7.3.12 + - fix: Fixing bad link on the Event page to the search engine. Added a new + Event template variable called urlSearch to handle it. (perlDreamer Consulting, LLC) 7.3.11 - Added an option for enabling coverage tests to testCodebase.pl. diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm index 1349a62ce..63a0e02da 100644 --- a/lib/WebGUI/Asset/Event.pm +++ b/lib/WebGUI/Asset/Event.pm @@ -1303,6 +1303,7 @@ sub getTemplateVars { $var{"urlWeek"} = $self->getParent->getUrl("type=week;start=".$dtStart->toMysql); $var{"urlMonth"} = $self->getParent->getUrl("type=month;start=".$dtStart->toMysql); $var{"urlParent"} = $self->getParent->getUrl; + $var{"urlSearch"} = $self->getParent->getSearchUrl; # Related links diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm index 81a779b7a..37bb38682 100644 --- a/lib/WebGUI/Asset/Wobject/Calendar.pm +++ b/lib/WebGUI/Asset/Wobject/Calendar.pm @@ -748,6 +748,21 @@ ENDSQL +#################################################################### + +=head2 getSearchUrl ( ) + +Convenience method to be shared with the Event. + +=cut + +sub getSearchUrl { + my $self = shift; + return $self->getUrl('func=search'); +} + + + #################################################################### @@ -918,7 +933,7 @@ sub view { $var->{"urlDay"} = $self->getUrl("type=day;start=".$params->{start}); $var->{"urlWeek"} = $self->getUrl("type=week;start=".$params->{start}); $var->{"urlMonth"} = $self->getUrl("type=month;start=".$params->{start}); - $var->{"urlSearch"} = $self->getUrl("func=search"); + $var->{"urlSearch"} = $self->getSearchUrl; $var->{"urlPrint"} = $self->getUrl("type=".$params->{type}.";start=".$params->{start}.";print=1"); # Parameters diff --git a/lib/WebGUI/Help/Asset_Event.pm b/lib/WebGUI/Help/Asset_Event.pm index f84638664..14021fa2c 100644 --- a/lib/WebGUI/Help/Asset_Event.pm +++ b/lib/WebGUI/Help/Asset_Event.pm @@ -217,6 +217,12 @@ our $HELP = { { 'name' => 'urlMonth', }, + { + 'name' => 'urlParent', + }, + { + 'name' => 'urlSearch', + }, { 'name' => 'relatedLinks', variables => [ diff --git a/lib/WebGUI/i18n/English/Asset_Event.pm b/lib/WebGUI/i18n/English/Asset_Event.pm index bf9f420cb..990d7aaad 100644 --- a/lib/WebGUI/i18n/English/Asset_Event.pm +++ b/lib/WebGUI/i18n/English/Asset_Event.pm @@ -341,6 +341,16 @@ our $I18N = { lastUpdated => 1171043883, }, + 'urlParent' => { + message => q|A URL the Calendar that contains this Event.|, + lastUpdated => 1172693361, + }, + + 'urlSearch' => { + message => q|A URL to the Search form for the Calendar that contains this Event.|, + lastUpdated => 1172693363, + }, + 'relatedLinks' => { message => q|This loop contains all links from this Event's set of related links.|, lastUpdated => 1171043883,