[freeside-commits] branch master updated. ce530564cdf3182e547652c7550e8e3676e61e01

[Christopher Burger]

The branch, master has been updated
       via  ce530564cdf3182e547652c7550e8e3676e61e01 (commit)
      from  f48a1666f8b7b967e202c6e36480209a9656710e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ce530564cdf3182e547652c7550e8e3676e61e01
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Thu Feb 21 12:17:10 2019 -0500

    RT# 82092 - Updated text to remind customer to restart apache after creating custom field

diff --git a/httemplate/edit/part_virtual_field.html b/httemplate/edit/part_virtual_field.html
index f3fb53065..8b8b33d0b 100644
--- a/httemplate/edit/part_virtual_field.html
+++ b/httemplate/edit/part_virtual_field.html
@@ -21,8 +21,8 @@
                          ],
             'edit_callback' => $callback,
             'error_callback' => $callback,
-            'html_init'      => 'Please be patient after clicking the button as 
-                                this process may take more than 10 seconds.
+            'html_init'      => 'Please be patient after clicking the button as this process may take more than 10 seconds.<br>
+                                 You will also need to restart Apache after adding the custom field.
                                 <br><br>',
           )
 %>
diff --git a/httemplate/edit/process/elements/process.html b/httemplate/edit/process/elements/process.html
index 1711b0118..19110e18b 100644
--- a/httemplate/edit/process/elements/process.html
+++ b/httemplate/edit/process/elements/process.html
@@ -34,6 +34,11 @@ Example:
 
    'clear_on_error' => [ 'form_field1', 'form_field2', ... ],
 
+   ## message will be returned to redirect page as cookie and read by header.html
+   ## append =status, =warning, =error to change color of message box.  Default is status
+   ## status is green, warning is yellow, and error is red
+   'message'        => [ 'My message=status', 'Please restart=warning' ],
+
                   #pass an arrayref of hashrefs for multiple m2ms or m2names
                   #be certain you incorporate m2m_Common if you see error: param
 
@@ -208,7 +213,16 @@ process();
   </HTML>
 
 %} else {
-<% $cgi->redirect($redirect) %>
+%  my $cookie;
+%  $cookie = CGI::Cookie->new(
+%                        -name    => 'freeside_status',
+%                        -value   => $messages,
+%                        -expires => '+5m',
+%                      ) if $messages;
+   <% $cgi->redirect( -uri    => $redirect,
+                      -cookie => $cookie,
+      )
+   %>
 %}
 <%init>
 
@@ -510,6 +524,8 @@ if ( !$error ) {
   }
 }
 
+my $messages = $opt{'message'} ? $opt{'message'} : '';
+
 my $edit_ext = $opt{'edit_ext'} || 'html';
 my $error_redirect = $opt{'error_redirect'}
                      || popurl(2)."$table.$edit_ext";
diff --git a/httemplate/edit/process/part_virtual_field.html b/httemplate/edit/process/part_virtual_field.html
index 97be7e65e..dc03ea4c8 100644
--- a/httemplate/edit/process/part_virtual_field.html
+++ b/httemplate/edit/process/part_virtual_field.html
@@ -1,6 +1,7 @@
 <% include( 'elements/process.html',
     'table'          => 'part_virtual_field',
     'viewall_dir'    => 'browse',
+    'message'        => [ 'Your custom field has been created, but will not be available untill Apache has been restarted.=warning', ],
     'precheck_callback' => sub {
         my ($cgi) = @_;
         $act = 'edit' if $cgi->param('vfieldpart');
@@ -25,7 +26,7 @@
             $dbh->commit or die $dbh->errstr; 
 
             # reload schema
-            my $dbdef_file = "/usr/local/etc/freeside/dbdef.".datasrc # XXX: fix this
+            my $dbdef_file = "/usr/local/etc/freeside/dbdef.".datasrc;
             my $dbdef = new_native DBIx::DBSchema $dbh;
             $dbdef->save($dbdef_file);
             delete $FS::Schema::dbdef_cache{$dbdef_file}; #force an actual reload
diff --git a/httemplate/elements/header-full.html b/httemplate/elements/header-full.html
index 5586a0a85..c73cf0463 100644
--- a/httemplate/elements/header-full.html
+++ b/httemplate/elements/header-full.html
@@ -204,8 +204,10 @@ Example:
 % if ( $cookies{freeside_status} ) {
     <BR>
 %   foreach my $status_msg ( $cookies{freeside_status}->value ) {
-      <TABLE CLASS="fsinnerbox" STYLE="background-color:#eeffee"><TR>
-        <TD><IMG SRC="<% $fsurl %>images/tick.png"> <% $status_msg |h %></TD>
+%     my ($message, $type) = split /=/, $status_msg;
+%     $type ||= 'status';
+      <TABLE CLASS="fsinnerbox" STYLE="background-color:<% $status_color{$type} %>"><TR>
+        <TD><IMG SRC="<% $fsurl %>images/tick.png"> <% $message |h %></TD>
       </TR></TABLE>
 %   }
     <script src="<% $fsurl %>elements/js.cookie.js"></script>
@@ -270,4 +272,7 @@ if ( scalar(@agentnums) == 1 ) {
   $company_url  = $conf->config('company_url');
 }
 
+## status->green(#eeffee), warning->yellow(#fdfd96), error->red(#f97c7c)
+my %status_color = ( 'status' => '#eeffee', 'warning' => '#fefbd0', 'error' => '#f97c7c', );
+
 </%init>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/edit/part_virtual_field.html         |  4 ++--
 httemplate/edit/process/elements/process.html   | 18 +++++++++++++++++-
 httemplate/edit/process/part_virtual_field.html |  3 ++-
 httemplate/elements/header-full.html            |  9 +++++++--
 4 files changed, 28 insertions(+), 6 deletions(-)