diff options
author | jeff <jeff> | 2010-06-01 19:58:28 +0000 |
---|---|---|
committer | jeff <jeff> | 2010-06-01 19:58:28 +0000 |
commit | 1702ffad58949ebe9e4769afeb9fe9c93249cf69 (patch) | |
tree | 49586e879aba7be6c61a96616489b38f146c9f04 /FS/FS/queue.pm | |
parent | 17d740b71a7f0cef5813ed494aa6f7761d889542 (diff) |
add progressbar, redirection, and improve links RT#8274
Diffstat (limited to 'FS/FS/queue.pm')
-rw-r--r-- | FS/FS/queue.pm | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/FS/FS/queue.pm b/FS/FS/queue.pm index 99e349c61..3f8763da8 100644 --- a/FS/FS/queue.pm +++ b/FS/FS/queue.pm @@ -12,7 +12,7 @@ use FS::Record qw( qsearch qsearchs dbh ); use FS::queue_arg; use FS::queue_depend; use FS::cust_svc; -use FS::CGI qw (rooturl); +use FS::CGI qw(rooturl); @ISA = qw(FS::Record); @EXPORT_OK = qw( joblisting ); @@ -67,6 +67,20 @@ Job status (new, locked, or failed) Freeform text status message +=cut + +sub statustext { + my $self = shift; + if ( defined ( $_[0] ) ) { + $self->SUPER::statustext(@_); + } else { + my $value = $self->SUPER::statustext(); + my $rooturl = rooturl(); + $value =~ s/%%%ROOTURL%%%/$rooturl/g; + $value; + } +} + =item _date UNIX timestamp @@ -363,7 +377,7 @@ If there is an error, returns the error, otherwise returns false. use vars qw($_update_statustext_dbh); sub update_statustext { my( $self, $statustext ) = @_; - return '' if $statustext eq $self->statustext; + return '' if $statustext eq $self->get('statustext'); #avoid rooturl expansion warn "updating statustext for $self to $statustext" if $DEBUG; $_update_statustext_dbh ||= myconnect; @@ -374,7 +388,7 @@ sub update_statustext { $sth->execute($statustext, $self->jobnum) or return $sth->errstr; $_update_statustext_dbh->commit or die $_update_statustext_dbh->errstr; - $self->statustext($statustext); + $self->set('statustext', $statustext); #avoid rooturl expansion ''; #my $new = new FS::queue { $self->hash }; |