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

[users] revert to old code

Browse Source
This commit is contained in:
Philip 2017-09-21 02:57:36 -04:00
parent 28931b32b5
commit cd379d131d
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
/* === This file is part of Calamares - <http://github.com/calamares> === /* === This file is part of Calamares - <http://github.com/calamares> ===
* *
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2017, Adriaan de Groot <groot@kde.org>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -21,7 +20,6 @@
#include "gui/UsersPage.h" #include "gui/UsersPage.h"
#include "utils/Logger.h"
#include "JobQueue.h" #include "JobQueue.h"
#include "GlobalStorage.h" #include "GlobalStorage.h"
#include "utils/Logger.h" #include "utils/Logger.h"
@ -174,26 +172,9 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap )
m_widget->setAvailableShells(shells); m_widget->setAvailableShells(shells);
} }
<<<<<<< HEAD
if ( configurationMap.contains( "avatarFilePath" ) && if ( configurationMap.contains( "avatarFilePath" ) &&
configurationMap.value( "avatarFilePath").type() == QVariant::String ) configurationMap.value( "avatarFilePath").type() == QVariant::String )
=======
if ( configurationMap.contains( "doReusePassword" ) &&
configurationMap.value( "doReusePassword" ).type() == QVariant::Bool )
>>>>>>> 34761c4214e95d877f0f1b2f29d479169885d646
{ {
m_widget->setAvatarFilePath( configurationMap.value( "avatarFilePath" ).toString() ); m_widget->setAvatarFilePath( configurationMap.value( "avatarFilePath" ).toString() );
} }
if ( configurationMap.contains( "passwordRequirements" ) &&
configurationMap.value( "passwordRequirements" ).type() == QVariant::Map )
{
auto pr_checks( configurationMap.value( "passwordRequirements" ).toMap() );
for (decltype(pr_checks)::const_iterator i = pr_checks.constBegin();
i != pr_checks.constEnd(); ++i)
{
m_widget->addPasswordCheck( i.key(), i.value() );
}
}
} }