fix company null
This commit is contained in:
Binary file not shown.
@@ -397,9 +397,14 @@ def init_routes(main_bp):
|
|||||||
|
|
||||||
data = request.get_json()
|
data = request.get_json()
|
||||||
try:
|
try:
|
||||||
|
# Ensure company is not None - use "Unknown" as default
|
||||||
|
company = data.get('company', 'Unknown')
|
||||||
|
if not company:
|
||||||
|
company = 'Unknown'
|
||||||
|
|
||||||
instance = Instance(
|
instance = Instance(
|
||||||
name=data['name'],
|
name=data['name'],
|
||||||
company=data['company'],
|
company=company,
|
||||||
payment_plan=data['payment_plan'],
|
payment_plan=data['payment_plan'],
|
||||||
main_url=data['main_url'],
|
main_url=data['main_url'],
|
||||||
status='inactive' # New instances start as inactive
|
status='inactive' # New instances start as inactive
|
||||||
@@ -436,7 +441,9 @@ def init_routes(main_bp):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
instance.name = data.get('name', instance.name)
|
instance.name = data.get('name', instance.name)
|
||||||
instance.company = data.get('company', instance.company)
|
# Ensure company is not None - use current value or "Unknown" as default
|
||||||
|
company = data.get('company', instance.company)
|
||||||
|
instance.company = company if company else "Unknown"
|
||||||
instance.payment_plan = data.get('payment_plan', instance.payment_plan)
|
instance.payment_plan = data.get('payment_plan', instance.payment_plan)
|
||||||
instance.main_url = data.get('main_url', instance.main_url)
|
instance.main_url = data.get('main_url', instance.main_url)
|
||||||
instance.status = data.get('status', instance.status)
|
instance.status = data.get('status', instance.status)
|
||||||
@@ -557,7 +564,9 @@ def init_routes(main_bp):
|
|||||||
if response.status_code == 200:
|
if response.status_code == 200:
|
||||||
data = response.json()
|
data = response.json()
|
||||||
if 'company_name' in data:
|
if 'company_name' in data:
|
||||||
instance.company = data['company_name']
|
# Set company to "Unknown" if company_name is None or empty
|
||||||
|
company_name = data['company_name']
|
||||||
|
instance.company = company_name if company_name else "Unknown"
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
current_app.logger.error(f"Error fetching instance settings: {str(e)}")
|
current_app.logger.error(f"Error fetching instance settings: {str(e)}")
|
||||||
|
|||||||
Reference in New Issue
Block a user