diff --git a/baseTemplate/static/baseTemplate/custom-js/system-status.js b/baseTemplate/static/baseTemplate/custom-js/system-status.js index cb0dbaf95..2cfd5d1e6 100755 --- a/baseTemplate/static/baseTemplate/custom-js/system-status.js +++ b/baseTemplate/static/baseTemplate/custom-js/system-status.js @@ -2,10 +2,8 @@ * Created by usman on 7/24/17. */ - /* Utilities */ - function getCookie(name) { var cookieValue = null; if (document.cookie && document.cookie !== '') { @@ -34,18 +32,15 @@ function randomPassword(length) { /* Utilities ends here */ - /* Java script code to monitor system status */ var app = angular.module('CyberCP', []); - app.config(['$interpolateProvider', function($interpolateProvider) { $interpolateProvider.startSymbol('{$'); $interpolateProvider.endSymbol('$}'); }]); - app.filter('getwebsitename', function() { return function(domain, uppercase) { @@ -93,13 +88,8 @@ app.controller('systemStatusInfo', function($scope,$http,$timeout) { } }); - - /* Admin status */ - - - app.controller('adminController', function($scope,$http,$timeout) { url = "/base/getAdminStatus"; @@ -315,11 +305,8 @@ app.controller('adminController', function($scope,$http,$timeout) { function cantLoadInitialData(response) {} }); - - /* Load average */ - app.controller('loadAvg', function($scope,$http,$timeout) { //getStuff(); @@ -350,13 +337,8 @@ app.controller('loadAvg', function($scope,$http,$timeout) { } }); - - - - /// home page system status - app.controller('homePageStatus', function($scope,$http,$timeout) { getStuff(); @@ -472,9 +454,6 @@ app.controller('homePageStatus', function($scope,$http,$timeout) { } }); - - - //////////// function increment(){ @@ -488,11 +467,8 @@ function increment(){ increment(); - - //////////// - app.controller('versionManagment', function($scope,$http,$timeout) { $scope.upgradeLoading = true; diff --git a/baseTemplate/views.py b/baseTemplate/views.py index a4385542d..8bfdc58f6 100755 --- a/baseTemplate/views.py +++ b/baseTemplate/views.py @@ -130,7 +130,7 @@ def versionManagment(request): currentBuild = data[1] except: currentVersion = latestVersion - currentBuild = str(latestBuild) + 'E' + currentBuild = str(5) + 'E' return render(request, 'baseTemplate/versionManagment.html', {'build': currentBuild, 'currentVersion': currentVersion, diff --git a/loginSystem/views.py b/loginSystem/views.py index fb05ae1d1..6617fd606 100644 --- a/loginSystem/views.py +++ b/loginSystem/views.py @@ -193,7 +193,7 @@ def loadLoginPage(request): firstName="Cyber",lastName="Panel", acl=acl, token=token) admin.save() - vers = version(currentVersion="1.9", build=4) + vers = version(currentVersion="1.9", build=5) vers.save() package = Package(admin=admin, packageName="Default", diskSpace=1000, diff --git a/plogical/adminPass.py b/plogical/adminPass.py index b499f37a5..858e795c4 100755 --- a/plogical/adminPass.py +++ b/plogical/adminPass.py @@ -34,7 +34,7 @@ def main(): firstName="Cyber", lastName="Panel", acl=acl, token=token) admin.save() - vers = version(currentVersion="1.9", build=4) + vers = version(currentVersion="1.9", build=5) vers.save() package = Package(admin=admin, packageName="Default", diskSpace=1000, diff --git a/static/baseTemplate/custom-js/system-status.js b/static/baseTemplate/custom-js/system-status.js index cb0dbaf95..2cfd5d1e6 100644 --- a/static/baseTemplate/custom-js/system-status.js +++ b/static/baseTemplate/custom-js/system-status.js @@ -2,10 +2,8 @@ * Created by usman on 7/24/17. */ - /* Utilities */ - function getCookie(name) { var cookieValue = null; if (document.cookie && document.cookie !== '') { @@ -34,18 +32,15 @@ function randomPassword(length) { /* Utilities ends here */ - /* Java script code to monitor system status */ var app = angular.module('CyberCP', []); - app.config(['$interpolateProvider', function($interpolateProvider) { $interpolateProvider.startSymbol('{$'); $interpolateProvider.endSymbol('$}'); }]); - app.filter('getwebsitename', function() { return function(domain, uppercase) { @@ -93,13 +88,8 @@ app.controller('systemStatusInfo', function($scope,$http,$timeout) { } }); - - /* Admin status */ - - - app.controller('adminController', function($scope,$http,$timeout) { url = "/base/getAdminStatus"; @@ -315,11 +305,8 @@ app.controller('adminController', function($scope,$http,$timeout) { function cantLoadInitialData(response) {} }); - - /* Load average */ - app.controller('loadAvg', function($scope,$http,$timeout) { //getStuff(); @@ -350,13 +337,8 @@ app.controller('loadAvg', function($scope,$http,$timeout) { } }); - - - - /// home page system status - app.controller('homePageStatus', function($scope,$http,$timeout) { getStuff(); @@ -472,9 +454,6 @@ app.controller('homePageStatus', function($scope,$http,$timeout) { } }); - - - //////////// function increment(){ @@ -488,11 +467,8 @@ function increment(){ increment(); - - //////////// - app.controller('versionManagment', function($scope,$http,$timeout) { $scope.upgradeLoading = true; diff --git a/static/websiteFunctions/websiteFunctions.js b/static/websiteFunctions/websiteFunctions.js index bda612705..e884f1678 100644 --- a/static/websiteFunctions/websiteFunctions.js +++ b/static/websiteFunctions/websiteFunctions.js @@ -6620,7 +6620,7 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) { type: 'success' }); $scope.fileStatus = false; - $scope.fileChangedContent = response.data.fileChangedContent; + document.getElementById("fileChangedContent").innerHTML = response.data.fileChangedContent; } else { new PNotify({ title: 'Operation Failed!', diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js index bda612705..e884f1678 100755 --- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js +++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js @@ -6620,7 +6620,7 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) { type: 'success' }); $scope.fileStatus = false; - $scope.fileChangedContent = response.data.fileChangedContent; + document.getElementById("fileChangedContent").innerHTML = response.data.fileChangedContent; } else { new PNotify({ title: 'Operation Failed!', diff --git a/websiteFunctions/templates/websiteFunctions/manageGIT.html b/websiteFunctions/templates/websiteFunctions/manageGIT.html index ee790c5f6..1d9904b2d 100755 --- a/websiteFunctions/templates/websiteFunctions/manageGIT.html +++ b/websiteFunctions/templates/websiteFunctions/manageGIT.html @@ -626,7 +626,7 @@ - @@ -665,30 +665,33 @@
+
-
-
+
-
- - -
- +
+
+
+
+
+
+
+
+
diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 5872fac96..9b5d5ab5f 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -3653,9 +3653,21 @@ StrictHostKeyChecking no return ACLManager.loadErrorJson() command = 'git -C %s show %s -- %s/%s' % (self.folder, self.commit, self.folder, self.file.strip('\n').strip(' ')) - fileChangedContent = ProcessUtilities.outputExecutioner(command) + fileChangedContent = ProcessUtilities.outputExecutioner(command).split('\n') - data_ret = {'status': 1, 'fileChangedContent': fileChangedContent} + fileLen = len(fileChangedContent) + finalContent = '' + + for i in range(12, fileLen-1): + if fileChangedContent[i][0] == '+': + finalContent = finalContent + '

%s


' % (fileChangedContent[i]) + elif fileChangedContent[i][0] == '-': + finalContent = finalContent + '

%s


' % (fileChangedContent[i]) + else: + finalContent = finalContent + '

%s


' % (fileChangedContent[i]) + + + data_ret = {'status': 1, 'fileChangedContent': finalContent} json_data = json.dumps(data_ret) return HttpResponse(json_data)
ID/th> + ID Commit Hash Description Commiter