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

[partition] Mount points should start with a /

Browse Source
This commit is contained in:
Adriaan de Groot 2022-02-01 14:07:38 +01:00
parent fbcd1ffbbe
commit d8be9a9443
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/partition/gui/CreatePartitionDialog.cpp
View File

@ -325,11 +325,17 @@ CreatePartitionDialog::updateMountPointUi()
void void
CreatePartitionDialog::checkMountPointSelection() CreatePartitionDialog::checkMountPointSelection()
{ {
if ( m_usedMountPoints.contains( selectedMountPoint( m_ui->mountPointComboBox ) ) ) const QString mountPoint = selectedMountPoint( m_ui->mountPointComboBox );
if ( m_usedMountPoints.contains( mountPoint ) )
{ {
m_ui->labelMountPoint->setText( tr( "Mountpoint already in use. Please select another one." ) ); m_ui->labelMountPoint->setText( tr( "Mountpoint already in use. Please select another one." ) );
m_ui->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false ); m_ui->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
} }
else if ( !mountPoint.isEmpty() && !mountPoint.startsWith( '/' ) )
{
m_ui->labelMountPoint->setText( tr( "Mountpoint must start with a <pre>/</pre>." ) );
m_ui->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
}
else else
{ {
m_ui->labelMountPoint->setText( QString() ); m_ui->labelMountPoint->setText( QString() );

8
src/modules/partition/gui/EditExistingPartitionDialog.cpp
View File

@ -295,11 +295,17 @@ EditExistingPartitionDialog::updateMountPointPicker()
void void
EditExistingPartitionDialog::checkMountPointSelection() EditExistingPartitionDialog::checkMountPointSelection()
{ {
if ( m_usedMountPoints.contains( selectedMountPoint( m_ui->mountPointComboBox ) ) ) const QString mountPoint = selectedMountPoint( m_ui->mountPointComboBox );
if ( m_usedMountPoints.contains( mountPoint ) )
{ {
m_ui->labelMountPoint->setText( tr( "Mountpoint already in use. Please select another one." ) ); m_ui->labelMountPoint->setText( tr( "Mountpoint already in use. Please select another one." ) );
m_ui->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false ); m_ui->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
} }
else if ( !mountPoint.isEmpty() && !mountPoint.startsWith( '/' ) )
{
m_ui->labelMountPoint->setText( tr( "Mountpoint must start with a <pre>/</pre>." ) );
m_ui->buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
}
else else
{ {
m_ui->labelMountPoint->setText( QString() ); m_ui->labelMountPoint->setText( QString() );