Ask for relation name if filename is not valid
By default when loading a file, a relation with the same name is created. Now, if the filename is not a valid relation name, the user will be prompted to manually insert a relation name. De-duplicated code for doing this when a new relation is created.
This commit is contained in:
@@ -240,12 +240,7 @@ class relForm(QtWidgets.QMainWindow):
|
|||||||
self.relations[i.text()] = result
|
self.relations[i.text()] = result
|
||||||
self.updateRelations()
|
self.updateRelations()
|
||||||
|
|
||||||
def newRelation(self):
|
def promptRelationName(self):
|
||||||
from relational_gui import creator
|
|
||||||
result = creator.edit_relation()
|
|
||||||
|
|
||||||
if result == None:
|
|
||||||
return
|
|
||||||
while True:
|
while True:
|
||||||
res = QtWidgets.QInputDialog.getText(
|
res = QtWidgets.QInputDialog.getText(
|
||||||
self,
|
self,
|
||||||
@@ -255,9 +250,8 @@ class relForm(QtWidgets.QMainWindow):
|
|||||||
QtWidgets.QLineEdit.Normal, ''
|
QtWidgets.QLineEdit.Normal, ''
|
||||||
)
|
)
|
||||||
if res[1] == False:# or len(res[0]) == 0:
|
if res[1] == False:# or len(res[0]) == 0:
|
||||||
return
|
return None
|
||||||
name = res[0]
|
name = res[0]
|
||||||
|
|
||||||
if not rtypes.is_valid_relation_name(name):
|
if not rtypes.is_valid_relation_name(name):
|
||||||
r = QtWidgets.QApplication.translate(
|
r = QtWidgets.QApplication.translate(
|
||||||
"Form", str("Wrong name for destination relation: %s." % name)
|
"Form", str("Wrong name for destination relation: %s." % name)
|
||||||
@@ -266,6 +260,15 @@ class relForm(QtWidgets.QMainWindow):
|
|||||||
self, QtWidgets.QApplication.translate("Form", "Error"), r
|
self, QtWidgets.QApplication.translate("Form", "Error"), r
|
||||||
)
|
)
|
||||||
continue
|
continue
|
||||||
|
return name
|
||||||
|
|
||||||
|
def newRelation(self):
|
||||||
|
from relational_gui import creator
|
||||||
|
result = creator.edit_relation()
|
||||||
|
|
||||||
|
if result == None:
|
||||||
|
return
|
||||||
|
name = self.promptRelationName()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.relations[name] = result
|
self.relations[name] = result
|
||||||
@@ -330,14 +333,11 @@ class relForm(QtWidgets.QMainWindow):
|
|||||||
|
|
||||||
if (name.endswith(".csv")): # removes the extension
|
if (name.endswith(".csv")): # removes the extension
|
||||||
name = name[:-4]
|
name = name[:-4]
|
||||||
else:
|
|
||||||
name.replace('.','')
|
|
||||||
|
|
||||||
if not rtypes.is_valid_relation_name(name):
|
if not rtypes.is_valid_relation_name(name):
|
||||||
r = QtWidgets.QApplication.translate(
|
name = self.promptRelationName()
|
||||||
"Form", str("Wrong name for destination relation: %s." % name))
|
|
||||||
QtWidgets.QMessageBox.information(
|
if name is None:
|
||||||
self, QtWidgets.QApplication.translate("Form", "Error"), r)
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
try:
|
try:
|
||||||
|
Reference in New Issue
Block a user