IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use ISO formatted dates when setting rolvaluntil. Fixes #1153

Browse Source
This commit is contained in:
Murtuza Zabuawala
2016-09-02 15:24:34 +01:00
committed by Dave Page
parent 842d078142
commit f3f7413701
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
web/pgadmin/browser/server_groups/servers/roles/__init__.py
View File

@@ -145,7 +145,7 @@ class RoleView(PGChildNodeView):
date = datetime.datetime.strptime( date = datetime.datetime.strptime(
data[u'rolvaliduntil'], '%m/%d/%Y' data[u'rolvaliduntil'], '%m/%d/%Y'
) )
data[u'rolvaliduntil'] = date.strftime("%d-%B-%Y") data[u'rolvaliduntil'] = date.strftime("%Y-%m-%d")
except Exception as e: except Exception as e:
return precondition_required( return precondition_required(
_("Date format is invalid.") _("Date format is invalid.")
@@ -640,11 +640,8 @@ rolmembership:{
'admin': True if role.group(1) == '1' else False 'admin': True if role.group(1) == '1' else False
}) })
row['rolmembership'] = res row['rolmembership'] = res
row['rolvaliduntil'] = row['rolvaliduntil'].isoformat() \ if row['rolvaliduntil'] is not None:
if isinstance( row['rolvaliduntil'] = row['rolvaliduntil'].split(' ')[0]
row['rolvaliduntil'],
(datetime.date, datetime.datetime)
) else None
if 'seclabels' in row and row['seclabels'] is not None: if 'seclabels' in row and row['seclabels'] is not None:
res = [] res = []
for sec in row['seclabels']: for sec in row['seclabels']: