From 9b43c6c238a27f92805d29693ad873cea4441eb9 Mon Sep 17 00:00:00 2001 From: liuzheng712 Date: Fri, 25 Mar 2016 23:52:48 +0800 Subject: [PATCH] update --- jlog/models.py | 18 +++++++++--------- jlog/views.py | 26 +++++++++++++------------- static/js/record.js | 8 ++++---- templates/jlog/log_offline.html | 9 +++++++-- templates/jlog/record.html | 2 +- 5 files changed, 34 insertions(+), 29 deletions(-) diff --git a/jlog/models.py b/jlog/models.py index 3a50259e5..7902ec6ca 100644 --- a/jlog/models.py +++ b/jlog/models.py @@ -16,15 +16,15 @@ class Log(models.Model): ''' add by liuzheng ''' - userMM = models.ManyToManyField(User) - logPath = models.TextField() - filename = models.CharField(max_length=40) - logPWD = models.TextField() # log zip file's - nick = models.TextField(null=True) # log's nick name - log = models.TextField(null=True) - history = models.TextField(null=True) - timestamp = models.IntegerField(default=int(time.time())) - datetimestamp = models.DateTimeField(auto_now_add=True) + # userMM = models.ManyToManyField(User) + # logPath = models.TextField() + # filename = models.CharField(max_length=40) + # logPWD = models.TextField() # log zip file's + # nick = models.TextField(null=True) # log's nick name + # log = models.TextField(null=True) + # history = models.TextField(null=True) + # timestamp = models.IntegerField(default=int(time.time())) + # datetimestamp = models.DateTimeField(auto_now_add=True) def __unicode__(self): diff --git a/jlog/views.py b/jlog/views.py index d917f0748..1386fd21f 100644 --- a/jlog/views.py +++ b/jlog/views.py @@ -7,7 +7,7 @@ from jperm.perm_api import user_have_perm from django.http import HttpResponseNotFound from jlog.log_api import renderTemplate -from jlog.models import Log, ExecLog, FileLog +from jlog.models import Log, ExecLog, FileLog,TermLog from jumpserver.settings import LOG_DIR import zipfile import json @@ -136,9 +136,9 @@ def log_record(request): elif request.method == "POST": log_id = request.REQUEST.get('id', None) if log_id: - logs = TermLogRecorder(request.user) - log = Log.objects.get(id=int(log_id)) - return HttpResponse(logs.load_full_log(log.filename)) + TermL = TermLogRecorder(request.user) + log = TermLog.objects.get(id=int(log_id)) + return HttpResponse(TermL.load_full_log(log.filename)) else: return HttpResponse("ERROR") else: @@ -261,16 +261,16 @@ class TermLogRecorder(object): zf.setpassword(password) zf.writestr(filename, json.dumps(self.log)) zf.close() - record = Log.objects.create(logPath=filepath, logPWD=password, filename=filename, + record = TermLog.objects.create(logPath=filepath, logPWD=password, filename=filename, history=json.dumps(self.CMD), timestamp=int(self.recoderStartTime)) if self.user: - record.userMM.add(self.user) + record.user.add(self.user) except: - record = Log.objects.create(logPath='locale', logPWD=password, log=json.dumps(self.log), + record = TermLog.objects.create(logPath='locale', logPWD=password, log=json.dumps(self.log), filename=filename, history=json.dumps(self.CMD), timestamp=int(self.recoderStartTime)) if self.user: - record.userMM.add(self.user) + record.user.add(self.user) def list(self, user=None, uid=None): tmp = [] @@ -281,7 +281,7 @@ class TermLogRecorder(object): else: user = self.user if user: - self._lists = Log.objects.filter(user=user.id) + self._lists = TermLog.objects.filter(user=user.id) for i in self._lists.all(): tmp.append( {'filename': i.filename, 'locale': i.logPath == 'locale', 'nick': i.nick, 'timestamp': i.timestamp, @@ -299,7 +299,7 @@ class TermLogRecorder(object): if self._lists: self.file = self._lists.get(filename=filename) else: - self.file = Log.objects.get(user=user.id, filename=filename) + self.file = TermLog.objects.get(user=user.id, filename=filename) if self.file.logPath == 'locale': return self.file.log else: @@ -323,7 +323,7 @@ class TermLogRecorder(object): if self._lists: self.file = self._lists.get(filename=filename) else: - self.file = Log.objects.get(user=user.id, filename=filename) + self.file = TermLog.objects.get(user=user.id, filename=filename) return self.file.history return 'ERROR User(None)' @@ -335,7 +335,7 @@ class TermLogRecorder(object): else: pass if user: - Log.objects.get(filename=filename).userMM.add(user) + TermLog.objects.get(filename=filename).user.add(user) return True return False @@ -347,6 +347,6 @@ class TermLogRecorder(object): else: pass if user: - Log.objects.get(filename=filename).userMM.remove(user) + TermLog.objects.get(filename=filename).user.remove(user) return True return False diff --git a/static/js/record.js b/static/js/record.js index 423211edc..910ebbc22 100644 --- a/static/js/record.js +++ b/static/js/record.js @@ -103,17 +103,17 @@ NgApp.controller('TerminalRecordCtrl', function ($scope, $http) { }; var term = new Terminal({ - rows: 80, - cols: 24, + rows: 24, + cols: 80, useStyle: true, screenKeys: true }); var timelist = []; for (var i in data) { - totalTime = totalTime > i ? totalTime : i; + totalTime = Math.max(totalTime, i); timelist.push(i); } - timelist = timelist.sort(); + timelist = timelist.sort(function(a, b){return a-b}); totalTime = totalTime * 1000; document.getElementById("afterScrubberText").innerHTML = buildTimeString(totalTime); term.open(document.getElementById('terminal')); diff --git a/templates/jlog/log_offline.html b/templates/jlog/log_offline.html index 62bda764f..4d0fd6367 100644 --- a/templates/jlog/log_offline.html +++ b/templates/jlog/log_offline.html @@ -8,6 +8,11 @@ {% include 'nav_cat_bar.html' %}