From f2bc3af56683f64e44fbbb97b543e6d58e99ce28 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Thu, 8 Sep 2016 11:26:12 -0700 Subject: fix UI links and CSS in searches delivered by email, #72101 --- httemplate/edit/saved_search.html | 22 ++++++++++++++++++++++ httemplate/elements/header-popup.html | 6 ++++++ 2 files changed, 28 insertions(+) (limited to 'httemplate') diff --git a/httemplate/edit/saved_search.html b/httemplate/edit/saved_search.html index 3039aed35..cb6aa45d1 100644 --- a/httemplate/edit/saved_search.html +++ b/httemplate/edit/saved_search.html @@ -61,6 +61,28 @@ <%init> my $curuser = $FS::CurrentUser::CurrentUser; +# remember the user's rooturl() when accessing the UI. this will be the +# base URL for sending email reports to that user so that links work. +my $rooturl_pref = qsearchs('access_user_pref', { + usernum => $curuser->usernum, + prefname => 'rooturl', +}); +my $error; +if ($rooturl_pref) { + if ($rooturl_pref->prefvalue ne rooturl()) { + $rooturl_pref->set('prefvalue', rooturl()); + $error = $rooturl_pref->replace; + } # else don't update it +} else { + $rooturl_pref = FS::access_user_pref->new({ + usernum => $curuser->usernum, + prefname => 'rooturl', + prefvalue => rooturl(), + }); + $error = $rooturl_pref->insert; +} + +warn "error updating rooturl pref: $error" if $error; # prefix to the freeside document root (usually '/freeside/') my $root = URI->new($fsurl)->path; diff --git a/httemplate/elements/header-popup.html b/httemplate/elements/header-popup.html index 04709ce53..906b1ee51 100644 --- a/httemplate/elements/header-popup.html +++ b/httemplate/elements/header-popup.html @@ -37,7 +37,13 @@ Example: <% $head |n %> > +% if ($m->notes('inline_stylesheet')) { # for email delivery + +% } else { +% } % if ( $title || $title_noescape ) { <% encode_entities($title) || $title_noescape |n %> -- cgit v1.2.1