Merge branch 'main' of http://gitea.schoenenberger.de/mistangl/CreoMigrate
This commit is contained in:
+9
-3
@@ -584,7 +584,7 @@ class CadItem(DataModel):
|
||||
self.check_key_existence("pdm_kategorie_neu", missing)
|
||||
|
||||
# Halbzeugfarbe
|
||||
hblzeug_oberfläche = self.get_gui_data("oberflaeche_neu")
|
||||
hblzeug_oberfläche = self.get_gui_data("halbzeugoberflaeche_neu")
|
||||
if hblzeug_oberfläche == "eloxieren" or hblzeug_oberfläche == "lackieren" or hblzeug_oberfläche == "pulverbeschichten":
|
||||
if not self.get_gui_data("halbzeugfarbe_neu"):
|
||||
missing.append("Halbzeugfarbe")
|
||||
@@ -1269,7 +1269,7 @@ class GuiLogic():
|
||||
elif key == 'cb_3Dmodel_neu':
|
||||
ret = self.cb_3Dmodel_neu(value)
|
||||
elif key == 'cb_halbzeugOhneSaege_neu':
|
||||
ret = self.cb_halbzeugOhneSaege_neu(value)
|
||||
set = self.cb_halbzeugOhneSaege_neu(value)
|
||||
elif key == 'cb_ruestcode_neu':
|
||||
ret = self.cb_ruestcode_neu(value)
|
||||
###
|
||||
@@ -2302,7 +2302,13 @@ class GuiLogic():
|
||||
|
||||
if selected is None:
|
||||
text = ''
|
||||
blacklist = self._config.get_blacklist()
|
||||
try:
|
||||
blacklist = self._config.get_blacklist()
|
||||
except:
|
||||
self._model.message_error('Blacklist nicht vorhanden', 'blacklist_not_exist')
|
||||
return {}
|
||||
|
||||
|
||||
if aenderungsindex_sivas.islower():
|
||||
if truemmer == 'J' or ruestcode == '':
|
||||
text = self._config.Zusatz.get('ComboTextblöcke', 'KleinbuchstabeTruemmer')
|
||||
|
||||
Reference in New Issue
Block a user