[netinstall] Simplify getting configuration

- Use convenience methods for getting bools and strings from
   the configuration map. Ignore empty groupsUrls.
main
Adriaan de Groot 7 years ago
parent 4daf5fce10
commit 3160bd7a54

@ -22,6 +22,8 @@
#include "JobQueue.h" #include "JobQueue.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "utils/CalamaresUtils.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "NetInstallPage.h" #include "NetInstallPage.h"
@ -179,16 +181,12 @@ NetInstallViewStep::onLeave()
void void
NetInstallViewStep::setConfigurationMap( const QVariantMap& configurationMap ) NetInstallViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{ {
m_widget->setRequired( m_widget->setRequired( CalamaresUtils::getBool( configurationMap, "required", false ) );
configurationMap.contains( "required" ) &&
configurationMap.value( "required" ).type() == QVariant::Bool &&
configurationMap.value( "required" ).toBool() );
if ( configurationMap.contains( "groupsUrl" ) && QString groupsUrl = CalamaresUtils::getString( configurationMap, "groupsUrl" );
configurationMap.value( "groupsUrl" ).type() == QVariant::String ) if ( !groupsUrl.isEmpty() )
{ {
Calamares::JobQueue::instance()->globalStorage()->insert( Calamares::JobQueue::instance()->globalStorage()->insert( "groupsUrl", groupsUrl );
"groupsUrl", configurationMap.value( "groupsUrl" ).toString() );
m_widget->loadGroupList(); m_widget->loadGroupList();
} }
} }

Loading…
Cancel
Save