allow towers without sectors, #16398 continued

[freeside.git] / FS / FS / svc_Common.pm

diff --git a/FS/FS/svc_Common.pm b/FS/FS/svc_Common.pm
index 9137c3f..ff00ce0 100644 (file)
--- a/FS/FS/svc_Common.pm
+++ b/FS/FS/svc_Common.pm
@@ -996,9 +996,8 @@ sub export_getsettings {
   my %defaults = ();
   my $error = $self->export('getsettings', \%settings, \%defaults);
   if ( $error ) {
-    #XXX bubble this up better
     warn "error running export_getsetings: $error";
-    return ( {}, {} );
+    return ( { 'error' => $error }, {} );
   }
   ( \%settings, \%defaults );
 }
@@ -1016,13 +1015,30 @@ sub export_getstatus {
   my %hash = ();
   my $error = $self->export('getstatus', \$html, \%hash);
   if ( $error ) {
-    #XXX bubble this up better
     warn "error running export_getstatus: $error";
-    return ( '', {} );
+    return ( '', { 'error' => $error } );
   }
   ( $html, \%hash );
 }
 
+=item export_setstatus
+
+Runs export_setstatus callbacks.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub export_setstatus {
+  my( $self, @args ) = @_;
+  my $error = $self->export('setstatus', @args);
+  if ( $error ) {
+    warn "error running export_setstatus: $error";
+    return $error;
+  }
+  '';
+}
+
+
 =item export HOOK [ EXPORT_ARGS ]
 
 Runs the provided export hook (i.e. "suspend", "unsuspend") for this service.