From 486ceec90e5c88977298c30baf2fee833c492c20 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 19 Feb 2014 23:54:52 -0800 Subject: [PATCH] Manager: the attach_project GUI RPC was using the web RPC URL; it needs to use the master URL --- clientgui/ProjectProcessingPage.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/clientgui/ProjectProcessingPage.cpp b/clientgui/ProjectProcessingPage.cpp index 7cdab867bd..7733978d64 100644 --- a/clientgui/ProjectProcessingPage.cpp +++ b/clientgui/ProjectProcessingPage.cpp @@ -375,7 +375,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE SetNextState(ATTACHPROJECT_ACCOUNTQUERY_EXECUTE); break; case ATTACHPROJECT_ACCOUNTQUERY_EXECUTE: - // Attempt to create the account or reterieve the authenticator. + // Attempt to create the account or retrieve the authenticator. ai->clear(); ao->clear(); @@ -542,8 +542,14 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE if (pWA->m_bCredentialsCached) { pDoc->rpc.project_attach_from_file(); } else { + string master_url; + if (!pWA->project_config.master_url.empty()) { + master_url = pWA->project_config.master_url; + } else { + master_url = (const char*)pWA->m_ProjectInfoPage->GetProjectURL().mb_str(); + } pDoc->rpc.project_attach( - ai->url.c_str(), + master_url.c_str(), ao->authenticator.c_str(), pWA->project_config.name.c_str() );