projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
just the relevant Pg info
[freeside.git]
/
httemplate
/
view
/
Status.html
diff --git
a/httemplate/view/Status.html
b/httemplate/view/Status.html
index
af58f35
..
f81c95d
100644
(file)
--- a/
httemplate/view/Status.html
+++ b/
httemplate/view/Status.html
@@
-30,6
+30,14
@@
if ( ! $@ && $os =~ /^\s*Description:\s*(.+)$/ ) {
$os = "Debian $deb_version";
}
$os = "Debian $deb_version";
}
+my $pkg_version = '';
+-e '/usr/bin/dpkg-query'
+ and run( ['/usr/bin/dpkg-query',
+ '--showformat=${Version}', '--show', 'freeside'
+ ],
+ '>', \$pkg_version
+ );
+
( my $perl_ver = $^V ) =~ s/^v//;
my $db = driver_name;
( my $perl_ver = $^V ) =~ s/^v//;
my $db = driver_name;
@@
-37,7
+45,7
@@
$db = 'PostgreSQL' if $db =~ /^Pg/;
$db = 'MySQL/MariaDB' if $db =~ /^mysql/;
my $db_ver = FS::Record->scalar_sql('SELECT VERSION()');
$db = 'MySQL/MariaDB' if $db =~ /^mysql/;
my $db_ver = FS::Record->scalar_sql('SELECT VERSION()');
-if ( $db eq 'PostgreSQL' && $db_ver =~ /^\s*PostgreSQL\s+([\w\.]+)\s+on\s+/ ) {
+if ( $db eq 'PostgreSQL' && $db_ver =~ /^\s*PostgreSQL\s+([\w\.]+
(\s+\([\w\s\.\+\-\:\~]+\))?
)\s+on\s+/ ) {
$db_ver = $1;
}
$db_ver = $1;
}
@@
-58,6
+66,13
@@
tie my %status, 'Tie::IxHash',
{ 'title' => 'Freeside version',
'value' => $FS::VERSION,
},
{ 'title' => 'Freeside version',
'value' => $FS::VERSION,
},
+ ( length($pkg_version)
+ ? ( { 'title' => 'Package version',
+ 'value' => $pkg_version,
+ },
+ )
+ : ()
+ ),
{ 'title' => 'Operating System',
'value' => $os,
},
{ 'title' => 'Operating System',
'value' => $os,
},