CCF_100/relational
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not crash when editing relations containing None

Browse Source
This commit is contained in:
Salvo 'LtWorf' Tomaselli 2020-08-23 11:25:50 +02:00
parent 5869f5d421
commit ff9f0c10b6
No known key found for this signature in database
GPG Key ID: B3A7CF0C801886CF
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
relational_gui/creator.py
View File

@ -52,13 +52,13 @@ class creatorForm(QtWidgets.QDialog):
for i in rel.content: for i in rel.content:
self.table.insertRow(self.table.rowCount()) self.table.insertRow(self.table.rowCount())
for j in range(len(i)): for j, value in enumerate(i):
if value is None:
raise Exception('Relation contains a None value and cannot be edited from the GUI')
item = QtWidgets.QTableWidgetItem() item = QtWidgets.QTableWidgetItem()
item.setText(i[j]) item.setText(str(value))
self.table.setItem(self.table.rowCount() - 1, j, item) self.table.setItem(self.table.rowCount() - 1, j, item)
pass
def setup_empty(self): def setup_empty(self):
self.table.insertColumn(0) self.table.insertColumn(0)
self.table.insertColumn(0) self.table.insertColumn(0)

12
relational_gui/guihandler.py
View File

@ -312,9 +312,15 @@ class relForm(QtWidgets.QMainWindow):
def editRelation(self): def editRelation(self):
from relational_gui import creator from relational_gui import creator
for i in self.ui.lstRelations.selectedItems(): for i in self.ui.lstRelations.selectedItems():
result = creator.edit_relation( try:
self.user_interface.get_relation(i.text()) result = creator.edit_relation(
) self.user_interface.get_relation(i.text())
)
except Exception as e:
QtWidgets.QMessageBox.warning(
self, QtWidgets.QApplication.translate("Form", "Error"), str(e)
)
return
if result != None: if result != None:
self.user_interface.set_relation(i.text(), result) self.user_interface.set_relation(i.text(), result)
self.updateRelations() self.updateRelations()