Amebis/GEANTLink
Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Confusion between provider ID and provider name resolved

Browse Source
This commit is contained in:
Simon Rozman 2016-08-30 21:10:10 +02:00
parent 8b266f086f
commit 858486412e
4 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/EAPBase/include/Config.h
View File

@ -452,7 +452,7 @@ namespace eap
public:
bool m_read_only; ///< Is profile read-only
std::wstring m_id; ///< Profile ID
std::wstring m_id; ///< Provider ID
winstd::tstring m_name; ///< Provider name
winstd::tstring m_help_email; ///< Helpdesk e-mail
winstd::tstring m_help_web; ///< Helpdesk website URL

2
lib/EAPBase/src/Config.cpp
View File

@ -346,7 +346,7 @@ eap::config_provider& eap::config_provider::operator=(_Inout_ config_provider &&
{
if (this != &other) {
(config&&)*this = std::move(other );
m_read_only = std::move(m_read_only);
m_read_only = std::move(other.m_read_only );
m_id = std::move(other.m_id );
m_name = std::move(other.m_name );
m_help_email = std::move(other.m_help_email );

6
lib/EAPBase_UI/include/EAP_UI.h
View File

@ -199,8 +199,8 @@ public:
provider->m_id.c_str(),
m_providers),
is_single ?
wxEAPGetProviderName(provider->m_id) :
winstd::tstring_printf(_T("%s (%u)"), wxEAPGetProviderName(provider->m_id), count));
wxEAPGetProviderName(provider->m_name) :
winstd::tstring_printf(_T("%s (%u)"), wxEAPGetProviderName(provider->m_name), count));
}
this->Layout();
@ -238,7 +238,7 @@ protected:
wxEAPConfigProvider dlg(cfg_provider, this);
if (dlg.ShowModal() == wxID_OK)
m_providers->SetPageText(idx, wxEAPGetProviderName(cfg_provider.m_id));
m_providers->SetPageText(idx, wxEAPGetProviderName(cfg_provider.m_name));
}
/// \endcond

6
lib/EAPBase_UI/src/EAP_UI.cpp
View File

@ -95,7 +95,7 @@ wxEAPCredentialsDialog::wxEAPCredentialsDialog(const eap::config_provider &prov,
wxEAPGeneralDialog(parent, id, title, pos, size, style)
{
// Set banner title.
m_banner->m_title->SetLabel(wxString::Format(_("%s Credentials"), wxEAPGetProviderName(prov.m_id).c_str()));
m_banner->m_title->SetLabel(wxString::Format(_("%s Credentials"), wxEAPGetProviderName(prov.m_name).c_str()));
}
@ -266,7 +266,7 @@ wxEAPProviderIdentityPanel::wxEAPProviderIdentityPanel(eap::config_provider &pro
bool wxEAPProviderIdentityPanel::TransferDataToWindow()
{
m_provider_name ->SetValue(m_prov.m_id );
m_provider_name ->SetValue(m_prov.m_name );
m_provider_web ->SetValue(m_prov.m_help_web );
m_provider_email->SetValue(m_prov.m_help_email);
m_provider_phone->SetValue(m_prov.m_help_phone);
@ -279,7 +279,7 @@ bool wxEAPProviderIdentityPanel::TransferDataFromWindow()
{
wxCHECK(wxEAPProviderIdentityPanelBase::TransferDataFromWindow(), false);
m_prov.m_id = m_provider_name ->GetValue();
m_prov.m_name = m_provider_name ->GetValue();
m_prov.m_help_web = m_provider_web ->GetValue();
m_prov.m_help_email = m_provider_email->GetValue();
m_prov.m_help_phone = m_provider_phone->GetValue();