napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[users] Simplify reading configuration

Browse Source
This commit is contained in:
Adriaan de Groot 2020-02-17 16:05:55 +01:00
parent dbba0c9b03
commit 33b3321698
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/modules/users/UsersViewStep.cpp
View File

@ -130,6 +130,8 @@ UsersViewStep::onLeave()
void void
UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap ) UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{ {
using CalamaresUtils::getBool;
if ( configurationMap.contains( "defaultGroups" ) if ( configurationMap.contains( "defaultGroups" )
&& configurationMap.value( "defaultGroups" ).type() == QVariant::List ) && configurationMap.value( "defaultGroups" ).type() == QVariant::List )
{ {
@ -155,25 +157,12 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap )
configurationMap.value( "sudoersGroup" ).toString() ); configurationMap.value( "sudoersGroup" ).toString() );
} }
if ( configurationMap.contains( "setRootPassword" ) bool setRootPassword = getBool( configurationMap, "setRootPassword", true );
&& configurationMap.value( "setRootPassword" ).type() == QVariant::Bool ) Calamares::JobQueue::instance()->globalStorage()->insert( "setRootPassword", setRootPassword );
{
Calamares::JobQueue::instance()->globalStorage()->insert(
"setRootPassword", configurationMap.value( "setRootPassword" ).toBool() );
m_widget->setWriteRootPassword( configurationMap.value( "setRootPassword" ).toBool() );
}
if ( configurationMap.contains( "doAutologin" ) m_widget->setWriteRootPassword( setRootPassword );
&& configurationMap.value( "doAutologin" ).type() == QVariant::Bool ) m_widget->setAutologinDefault( getBool( configurationMap, "doAutologin", false ) );
{ m_widget->setReusePasswordDefault( getBool( configurationMap, "doReusePassword", false ) );
m_widget->setAutologinDefault( configurationMap.value( "doAutologin" ).toBool() );
}
if ( configurationMap.contains( "doReusePassword" )
&& configurationMap.value( "doReusePassword" ).type() == QVariant::Bool )
{
m_widget->setReusePasswordDefault( configurationMap.value( "doReusePassword" ).toBool() );
}
if ( configurationMap.contains( "passwordRequirements" ) if ( configurationMap.contains( "passwordRequirements" )
&& configurationMap.value( "passwordRequirements" ).type() == QVariant::Map ) && configurationMap.value( "passwordRequirements" ).type() == QVariant::Map )
@ -186,9 +175,8 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap )
} }
} }
m_widget->setPasswordCheckboxVisible( CalamaresUtils::getBool( configurationMap, "allowWeakPasswords", false ) ); m_widget->setPasswordCheckboxVisible( getBool( configurationMap, "allowWeakPasswords", false ) );
m_widget->setValidatePasswordDefault( m_widget->setValidatePasswordDefault( !getBool( configurationMap, "allowWeakPasswordsDefault", false ) );
!CalamaresUtils::getBool( configurationMap, "allowWeakPasswordsDefault", false ) );
QString shell( QLatin1String( "/bin/bash" ) ); // as if it's not set at all QString shell( QLatin1String( "/bin/bash" ) ); // as if it's not set at all
if ( configurationMap.contains( "userShell" ) ) if ( configurationMap.contains( "userShell" ) )