clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-21 18:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

use -s option for older versions of git (#10561)

Browse Source 
fix small visual issue too
This commit is contained in:
Tony Murray 2019-08-27 16:48:21 -05:00 committed by GitHub
parent 2e2c329e9c
commit 852647198b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LibreNMS/Util/Version.php
View File

@ -77,15 +77,15 @@ class Version
public function gitChangelog()
{
if ($this->is_git_install) {
return shell_exec('git log -10');
}
return $this->is_git_install
? rtrim(shell_exec('git log -10'))
: '';
}
public function gitDate()
{
if ($this->is_git_install) {
return shell_exec("git show --pretty='%ct' --no-patch HEAD");
}
return $this->is_git_install
? rtrim(shell_exec("git show --pretty='%ct' -s HEAD"))
: '';
}
}

11
resources/views/about/index.blade.php
View File

@ -28,7 +28,7 @@
<table class='table table-condensed table-hover'>
<tr>
<td><b>@lang('Version')</b></td>
<td><a href='http://www.librenms.org/changelog.html'>{{ $version_local }} - <span id='version_date'>{{ $git_date }}</span></a></td>
<td><a href='http://www.librenms.org/changelog.html'>{{ $version_local }}<span id='version_date' style="display: none;">{{ $git_date }}</span></a></td>
</tr>
<tr>
<td><b>@lang('Database Schema')</b></td>
@ -91,8 +91,9 @@
<td colspan='4'>
<span class='bg-danger'>
<label for="callback">@lang('Opt in to send anonymous usage statistics to LibreNMS?')</label><br />
<input type="checkbox" id="callback" data-size="normal" name="statistics" @if($callback_status) checked @endif>
</span><br />
</span>
<input type="checkbox" id="callback" data-size="normal" name="statistics" @if($callback_status) checked @endif>
<br />
@lang('Online stats:') <a href='https://stats.librenms.org/'>stats.librenms.org</a>
</td>
</tr>
@ -222,6 +223,8 @@ along with this program. If not, see <a href="http://www.gnu.org/licenses/">htt
});
var ver_date = $('#version_date');
ver_date.text(moment.unix(ver_date.text()));
if (ver_date.text()) {
ver_date.text(' - '.concat(moment.unix(ver_date.text()))).show();
}
</script>
@endsection