Repository: kylin Updated Branches: refs/heads/2.x-staging 84b56665d -> 3869540c5
KYLIN-1386 ODBC - Fix issue of duplicated projects in Connection/DSN dialog Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3869540c Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3869540c Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3869540c Branch: refs/heads/2.x-staging Commit: 3869540c5ef8c3bd4b3b7204c1e1b831b2b6a15e Parents: 84b5666 Author: lidongsjtu <lid...@apache.org> Authored: Mon Feb 1 11:10:06 2016 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Mon Feb 1 11:10:55 2016 +0800 ---------------------------------------------------------------------- odbc/Driver/KO_CONN.CPP | 2 ++ odbc/Driver/KO_Config.cpp | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/3869540c/odbc/Driver/KO_CONN.CPP ---------------------------------------------------------------------- diff --git a/odbc/Driver/KO_CONN.CPP b/odbc/Driver/KO_CONN.CPP index 7c3c43d..9d31df0 100644 --- a/odbc/Driver/KO_CONN.CPP +++ b/odbc/Driver/KO_CONN.CPP @@ -395,6 +395,8 @@ INT_PTR CALLBACK DlgDSNCfg1Proc ( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP std::vector<string> projects; restListProjects ( pgConn->Server, pgConn->ServerPort, pgConn->UserName, pgConn->Password, projects ); + // reload project list + SendMessage ( hwndCombo, CB_RESETCONTENT, 0, 0 ); for ( unsigned int i = 0 ; i < projects.size(); ++i ) { SendMessage ( hwndCombo, ( UINT ) CB_ADDSTRING, ( WPARAM ) 0, ( LPARAM ) projects.at ( i ).c_str() ); } http://git-wip-us.apache.org/repos/asf/kylin/blob/3869540c/odbc/Driver/KO_Config.cpp ---------------------------------------------------------------------- diff --git a/odbc/Driver/KO_Config.cpp b/odbc/Driver/KO_Config.cpp index 69b9d97..bb27fb4 100644 --- a/odbc/Driver/KO_Config.cpp +++ b/odbc/Driver/KO_Config.cpp @@ -592,6 +592,8 @@ INT_PTR CALLBACK DlgDSNCfg2Proc ( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP std::vector<string> projects; restListProjects ( serverStr, port, uidStr, pwdStr, projects ); + // reload project list + SendMessage ( hwndCombo, CB_RESETCONTENT, 0, 0 ); for ( unsigned int i = 0 ; i < projects.size(); ++i ) { SendMessage ( hwndCombo, ( UINT ) CB_ADDSTRING, ( WPARAM ) 0, ( LPARAM ) projects.at ( i ).c_str() ); }