summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2018-11-02 14:32:25 -0400
committerPliable Pixels <pliablepixels@gmail.com>2018-11-02 14:32:25 -0400
commit73014ac9a48fd584a4e0665358d240dde3024887 (patch)
tree6d79abbf8ec485273973a4efbd7e2a514c319961 /www/js
parentbc05a57fb82940d6d117f776316643aabe0e58d5 (diff)
add ZM version to display
Diffstat (limited to 'www/js')
-rw-r--r--www/js/LogCtrl.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js
index 599c63d1..01566750 100644
--- a/www/js/LogCtrl.js
+++ b/www/js/LogCtrl.js
@@ -70,7 +70,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
$scope.downloadLogs = function () {
var body = "zmNinja version:" + $scope.zmAppVersion +
" (" + $rootScope.platformOS + ")\n" +
- "ZoneMinder version:" + NVRDataModel.getCurrentServerVersion();
+ "ZoneMinder version:" + NVRDataModel.getCurrentServerVersion()+"\n\n";
body = $translate.instant('kSensitiveBody') + '\n\n\n' + body;
var fname = $rootScope.appName + "-logs-" +
@@ -107,7 +107,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
$scope.attachLogs = function () {
var body = "zmNinja version:" + $scope.zmAppVersion +
" (" + $rootScope.platformOS + ")<br/>" +
- "ZoneMinder version:" + NVRDataModel.getCurrentServerVersion();
+ "ZoneMinder version:" + NVRDataModel.getCurrentServerVersion() + "<br/>";
body = '<b>' + $translate.instant('kSensitiveBody') + '</b><br/><br/>' + body;
$fileLogger.checkFile()
@@ -254,6 +254,7 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
};
$scope.zmAppVersion = NVRDataModel.getAppVersion();
+ $scope.zmVersion = NVRDataModel.getCurrentServerVersion();
/* intervalLogUpdateHandle = $interval(function ()
{