mirror
/
vorta
mirror of https://github.com/borgbase/vorta
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent profiles from sharing the same name. Fixes #512

This commit is contained in:
samuel-w 2020-06-22 03:05:55 -05:00 committed by GitHub
parent d92418cc45
commit 87083c1004
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/vorta/views/main_window.py
View File

@ -122,7 +122,7 @@ class MainWindow(MainWindowBase, MainWindowUI):
window.setParent(self, QtCore.Qt.Sheet)
window.show()
if window.exec_():
self.profileSelector.setItemText(self.profileSelector.currentIndex(), window.edited_profile.name)
self.profileSelector.setItemText(self.profileSelector.currentIndex(), window.profileNameField.text())
def profile_delete_action(self):
if self.profileSelector.count() > 1:
@ -146,7 +146,7 @@ class MainWindow(MainWindowBase, MainWindowUI):
window = AddProfileWindow()
window.setParent(self, QtCore.Qt.Sheet)
window.show()
if window.exec_() and window.edited_profile:
if window.exec_():
self.profileSelector.addItem(window.edited_profile.name, window.edited_profile.id)
self.profileSelector.setCurrentIndex(self.profileSelector.count() - 1)
else:

28
src/vorta/views/profile_add_edit_dialog.py
View File

@ -15,6 +15,7 @@ class AddProfileWindow(AddProfileBase, AddProfileUI):
self.buttonBox.rejected.connect(self.close)
self.buttonBox.accepted.connect(self.save)
self.profileNameField.textChanged.connect(self.button_validation)
self.buttonBox.button(QDialogButtonBox.Save).setText(self.tr("Save"))
self.buttonBox.button(QDialogButtonBox.Cancel).setText(self.tr("Cancel"))
@ -25,16 +26,21 @@ class AddProfileWindow(AddProfileBase, AddProfileUI):
self.existing_id = rename_existing_id
self.modalTitle.setText(self.tr('Rename Profile'))
# Call validate to set inital messages
self.buttonBox.button(QDialogButtonBox.Save).setEnabled(self.validate())
def _set_status(self, text):
self.errorText.setText(text)
self.errorText.repaint()
def save(self):
if self.validate():
new_profile = BackupProfileModel(name=self.profileNameField.text())
new_profile.save()
self.edited_profile = new_profile
self.accept()
new_profile = BackupProfileModel(name=self.profileNameField.text())
new_profile.save()
self.edited_profile = new_profile
self.accept()
def button_validation(self):
self.buttonBox.button(QDialogButtonBox.Save).setEnabled(self.validate())
def validate(self):
name = self.profileNameField.text()
@ -49,14 +55,14 @@ class AddProfileWindow(AddProfileBase, AddProfileUI):
self._set_status(self.tr('A profile with this name already exists.'))
return False
self._set_status(self.tr(''))
return True
class EditProfileWindow(AddProfileWindow):
def save(self):
if self.validate():
renamed_profile = BackupProfileModel.get(id=self.existing_id)
renamed_profile.name = self.profileNameField.text()
renamed_profile.save()
self.edited_profile = renamed_profile
self.accept()
renamed_profile = BackupProfileModel.get(id=self.existing_id)
renamed_profile.name = self.profileNameField.text()
renamed_profile.save()
self.edited_profile = renamed_profile
self.accept()