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

Disallow next if the root password is not reused or provided.

Browse Source 
CAL-344 #close
This commit is contained in:
Teo Mrnjavac 2015-11-20 16:27:32 +01:00
parent 8a6dcfbe2f
commit 22470ba4af
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/users/UsersPage.cpp
View File

@ -47,7 +47,7 @@ UsersPage::UsersPage( QWidget* parent )
, m_readyHostname( false )
, m_readyPassword( false )
, m_readyRootPassword( false )
, m_showRootPassword( true )
, m_writeRootPassword( true )
{
ui->setupUi( this );
@ -75,12 +75,13 @@ UsersPage::UsersPage( QWidget* parent )
ui->labelRootPasswordError->setVisible( !checked );
ui->textBoxRootPassword->setVisible( !checked );
ui->textBoxVerifiedRootPassword->setVisible( !checked );
checkReady( isReady() );
} );
m_customUsername = false;
m_customHostname = false;
setShowRootPassword( true );
setWriteRootPassword( true );
ui->checkBoxReusePassword->setChecked( true );
CALAMARES_RETRANSLATE( ui->retranslateUi( this ); )
@ -96,11 +97,14 @@ UsersPage::~UsersPage()
bool
UsersPage::isReady()
{
return m_readyFullName &&
m_readyHostname &&
m_readyPassword &&
( !m_showRootPassword || ( ui->checkBoxReusePassword->isChecked() || m_readyRootPassword ) ) &&
m_readyUsername;
bool readyFields = m_readyFullName &&
m_readyHostname &&
m_readyPassword &&
m_readyUsername;
if ( !m_writeRootPassword || ui->checkBoxReusePassword->isChecked() )
return readyFields;
return readyFields && m_readyRootPassword;
}
@ -124,7 +128,7 @@ UsersPage::createJobs( const QStringList& defaultGroupsList )
ui->textBoxUserPassword->text() );
list.append( Calamares::job_ptr( j ) );
if ( m_showRootPassword )
if ( m_writeRootPassword )
{
if ( ui->checkBoxReusePassword->isChecked() )
j = new SetPasswordJob( "root",
@ -158,10 +162,10 @@ UsersPage::onActivate()
void
UsersPage::setShowRootPassword( bool show )
UsersPage::setWriteRootPassword( bool write )
{
ui->checkBoxReusePassword->setVisible( show );
m_showRootPassword = show;
ui->checkBoxReusePassword->setVisible( write );
m_writeRootPassword = write;
}
@ -424,10 +428,12 @@ void
UsersPage::setAutologinDefault( bool checked )
{
ui->checkBoxAutoLogin->setChecked( checked );
emit checkReady( isReady() );
}
void
UsersPage::setReusePasswordDefault( bool checked )
{
ui->checkBoxReusePassword->setChecked( checked );
emit checkReady( isReady() );
}

4
src/modules/users/UsersPage.h
View File

@ -44,7 +44,7 @@ public:
void onActivate();
void setShowRootPassword( bool show );
void setWriteRootPassword( bool show );
void setAutologinDefault( bool checked );
void setReusePasswordDefault( bool checked );
@ -78,7 +78,7 @@ private:
bool m_readyPassword;
bool m_readyRootPassword;
bool m_showRootPassword;
bool m_writeRootPassword;
};
#endif // USERSPAGE_H

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

@ -151,7 +151,7 @@ UsersViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{
Calamares::JobQueue::instance()->globalStorage()->insert( "setRootPassword",
configurationMap.value( "setRootPassword" ).toBool() );
m_widget->setShowRootPassword( configurationMap.value( "setRootPassword" ).toBool() );
m_widget->setWriteRootPassword( configurationMap.value( "setRootPassword" ).toBool() );
}
if ( configurationMap.contains( "doAutologin" ) &&