Mirrored_Repos/NexusDashboard
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/NexusDashboard.git synced 2025-01-08 13:47:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove print, fix some stuff

Browse Source
This commit is contained in:
Aaron Kimbre 2022-06-06 23:08:56 -05:00
parent f7703abe5e
commit 0b04dab1d2
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/cdclient.py
View File

@ -3096,7 +3096,7 @@ class MissionText(db.Model):
nullable=False nullable=False
) )
Icon = db.relationship("Icons") Icon = db.relationship("Icons", foreign_keys=[IconID])
state_1_anim = db.Column( state_1_anim = db.Column(
sqlite.TEXT(), sqlite.TEXT(),
@ -3224,7 +3224,7 @@ class MissionText(db.Model):
nullable=False nullable=False
) )
turnInIcon = db.relationship("Icons") turnInIcon = db.relationship("Icons", foreign_keys=[turnInIconID])
localize = db.Column( localize = db.Column(
sqlite.BOOLEAN(), sqlite.BOOLEAN(),

4
app/luclient.py
View File

@ -225,7 +225,9 @@ def get_lot_name(lot_id):
if name == f'Objects_{lot_id}_name': if name == f'Objects_{lot_id}_name':
intermed = Objects.query.filter(Objects.id == lot_id).first() intermed = Objects.query.filter(Objects.id == lot_id).first()
if intermed: if intermed:
name = intermed.displayName if (intermed.displayName != "None" and intermed.displayName != "" and intermed.displayName is None) else intermed.name name = intermed.displayName if (intermed.displayName != "None" or intermed.displayName != "" or intermed.displayName == None) else intermed.name
if not name:
name = f'Objects_{lot_id}_name'
return name return name

6
app/properties.py
View File

@ -204,7 +204,7 @@ def get(status="all"):
rowTable = DataTables(params, query, columns) rowTable = DataTables(params, query, columns)
data = rowTable.output_result() data = rowTable.output_result()
print(data)
for property_data in data["data"]: for property_data in data["data"]:
id = property_data["0"] id = property_data["0"]
@ -246,7 +246,7 @@ def get(status="all"):
if property_data["4"] == "": if property_data["4"] == "":
property_data["4"] = ZoneTable.query.filter( property_data["4"] = ZoneTable.query.filter(
ZoneTable.zoneID == property_data.zone_id ZoneTable.zoneID == property_data["13"]
).first().DisplayDescription ).first().DisplayDescription
if property_data["6"] == 0: if property_data["6"] == 0:
@ -265,7 +265,7 @@ def get(status="all"):
property_data["7"] = '''<h2 class="far fa-check-square text-success"></h2>''' property_data["7"] = '''<h2 class="far fa-check-square text-success"></h2>'''
property_data["13"] = ZoneTable.query.filter( property_data["13"] = ZoneTable.query.filter(
ZoneTable.zoneID == property_data.zone_id ZoneTable.zoneID == property_data["13"]
).first().DisplayDescription ).first().DisplayDescription
return data return data