mirror.MikroTik/MikroWizard.mikroman
0
0
Fork 0
mirror of https://github.com/MikroWizard/mikroman.git synced 2025-07-10 14:04:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some bugs..

Browse source
This commit is contained in:
sepehr 2024-07-31 17:42:42 +03:30
parent ef3ce0e133
commit b220c6b98a
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
py/api/api_logs.py
View file

@ -247,7 +247,8 @@ def syslog_list():
else: else:
clauses.append(syslog.created >= datetime.datetime.now()-datetime.timedelta(days=1)) clauses.append(syslog.created >= datetime.datetime.now()-datetime.timedelta(days=1))
if event_end_time: if event_end_time:
event_end_time=datetime.datetime.strptime(event_end_time, "%Y-%m-%d %H:%M:%S") event_end_time=event_end_time.split(".000Z")[0]
event_end_time=datetime.datetime.strptime(event_end_time, "%Y-%m-%dT%H:%M:%S")
clauses.append(syslog.created <= event_end_time) clauses.append(syslog.created <= event_end_time)
else: else:
clauses.append(syslog.created <= datetime.datetime.now()) clauses.append(syslog.created <= datetime.datetime.now())

4
py/libs/db/db_AA.py
View file

@ -78,12 +78,8 @@ class Auth(BaseModel):
auth=auth.where(Auth.started > timestamp-2,Auth.started < timestamp+2) auth=auth.where(Auth.started > timestamp-2,Auth.started < timestamp+2)
time.sleep(0.3) time.sleep(0.3)
count+=1 count+=1
log.error(count)
else: else:
auth=False auth=False
log.error(auth)
if auth:
log.error(list(auth))
if auth and len(list(auth))>0: if auth and len(list(auth))>0:
auth=list(auth) auth=list(auth)
for a in auth: for a in auth:

2
py/libs/db/db_user_group_perm.py
View file

@ -31,7 +31,7 @@ class DevUserGroupPermRel(BaseModel):
def __repr__(self): def __repr__(self):
return "DevUserGroupPermRel: user_id: %s, group_id: %s, perm_id: %s" % (self.user_id, self.group_id, self.perm_id) return "DevUserGroupPermRel: user_id: %s, group_id: %s, perm_id: %s" % (self.user_id, self.group_id, self.perm_id)
def get_user_devices(uid,group_id): def get_user_devices(uid,group_id=False):
perms=list(DevUserGroupPermRel.select().where(DevUserGroupPermRel.user_id == uid)) perms=list(DevUserGroupPermRel.select().where(DevUserGroupPermRel.user_id == uid))
for perm in perms: for perm in perms:
if group_id==1 or (perm.group_id.id == 1 and not group_id): if group_id==1 or (perm.group_id.id == 1 and not group_id):