Ensure account expiration dates are displayed and handled consistently [Ashesh Vashi...

git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@7813 a7884b65-44f6-0310-8a51-81a127f17b15

diff --git a/pgadmin/ctl/calbox.cpp b/pgadmin/ctl/calbox.cpp
index 387c8c23f15875ebf1a0f3fdee621e47e1c9628f..9835e8f39337aef079d56c5feae30f1b84257398 100644 (file)
--- a/pgadmin/ctl/calbox.cpp
+++ b/pgadmin/ctl/calbox.cpp
@@ -72,7 +72,7 @@ bool wxCalendarBox::Create(wxWindow *parent,
 {
     wxString txt;
     if (date.IsValid())
-        txt = date.FormatDate();
+        txt = date.FormatISODate();
 
     if ( !wxControl::Create(parent, id, pos, size,
                             style | wxCLIP_CHILDREN | wxWANTS_CHARS,
@@ -106,7 +106,7 @@ bool wxCalendarBox::Create(wxWindow *parent,
     m_txt=new wxTextCtrl(this, CTRLID_TXT, txt, wxDefaultPosition, size, TXTCTRL_FLAGS);
     m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KEY_DOWN, wxKeyEventHandler(wxCalendarBox::OnEditKey), 0, this);
     m_txt->Connect(wxID_ANY, wxID_ANY, wxEVT_KILL_FOCUS, wxFocusEventHandler(wxCalendarBox::OnKillFocus), 0, this);
-    SetFormat(wxT("%x"));
+    SetFormat(wxT("%Y-%m-%d"));
 
     m_btn = new wxBitmapButton(this, CTRLID_BTN, bmp, wxDefaultPosition, bs);
 
@@ -339,7 +339,7 @@ bool wxCalendarBox::SetValue(const wxDateTime& date)
     if (m_cal)
     {
         if (date.IsValid())
-            m_txt->SetValue(date.FormatDate());
+            m_txt->SetValue(date.FormatISODate());
         else
             m_txt->SetValue(wxEmptyString);
     }
@@ -443,7 +443,7 @@ void wxCalendarBox::OnSelChange(wxCalendarEvent &ev)
 {
     if (m_cal)
     {
-        m_txt->SetValue(m_cal->GetDate().FormatDate());
+        m_txt->SetValue(m_cal->GetDate().FormatISODate());
         if (ev.GetEventType() == wxEVT_CALENDAR_DOUBLECLICKED)
         {
             DropDown(false);

diff --git a/pgadmin/schema/pgRole.cpp b/pgadmin/schema/pgRole.cpp
index 7866a385fd4e44b7481f8d9fe43d6cee1c8cf8e9..0ebfbc50eafead0b4efc5d440d3c9001fa9530e6 100644 (file)
--- a/pgadmin/schema/pgRole.cpp
+++ b/pgadmin/schema/pgRole.cpp
@@ -255,7 +255,7 @@ void pgRole::ShowTreeDetail(ctlTree *browser, frmMain *form, ctlListView *proper
 
         properties->AppendItem(_("Name"), GetName());
         properties->AppendItem(_("OID"), GetOid());
-        properties->AppendItem(_("Account expires"), GetAccountExpires());
+        properties->AppendItem(_("Account expires"), DateToAnsiStr(GetAccountExpires()));
         properties->AppendItem(_("Can login?"), BoolToYesNo(GetCanLogin()));
         properties->AppendItem(_("Superuser?"), BoolToYesNo(GetSuperuser()));
         properties->AppendItem(_("Create databases?"), BoolToYesNo(GetCreateDatabase()));

diff --git a/pgadmin/schema/pgUser.cpp b/pgadmin/schema/pgUser.cpp
index 68b0e101d6f3b7d4d99aaf3e8416591a08d1849e..89c3e0c166d02af59ac14348c13030ef8f01ab44 100644 (file)
--- a/pgadmin/schema/pgUser.cpp
+++ b/pgadmin/schema/pgUser.cpp
@@ -195,7 +195,7 @@ void pgUser::ShowTreeDetail(ctlTree *browser, frmMain *form, ctlListView *proper
 
         properties->AppendItem(_("Name"), GetName());
         properties->AppendItem(_("User ID"), GetUserId());
-        properties->AppendItem(_("Account expires"), GetAccountExpires());
+        properties->AppendItem(_("Account expires"), DateToAnsiStr(GetAccountExpires()));
         properties->AppendItem(_("Superuser?"), BoolToYesNo(GetSuperuser()));
         properties->AppendItem(_("Create databases?"), BoolToYesNo(GetCreateDatabase()));
         properties->AppendItem(_("Update catalogs?"), BoolToYesNo(GetUpdateCatalog()));