dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

Restore booster state even when it was replaced by another booster

Browse Source
This commit is contained in:
DarkPhoenix
2019-04-10 18:18:26 +03:00
parent 7fc98037a6
commit fda2c43a1d
8 changed files with 64 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eos/db/saveddata/character.py
View File

@@ -23,7 +23,7 @@ import datetime
from eos.db import saveddata_meta
from eos.db.saveddata.implant import charImplants_table
from eos.effectHandlerHelpers import HandledImplantBoosterList, HandledSsoCharacterList
from eos.effectHandlerHelpers import HandledImplantList, HandledSsoCharacterList
from eos.saveddata.implant import Implant
from eos.saveddata.user import User
from eos.saveddata.character import Character, Skill
@@ -75,7 +75,7 @@ mapper(Character, characters_table,
cascade="all,delete-orphan"),
"_Character__implants" : relation(
Implant,
collection_class=HandledImplantBoosterList,
collection_class=HandledImplantList,
cascade='all,delete-orphan',
backref='character',
single_parent=True,

6
eos/db/saveddata/fit.py
View File

@@ -31,7 +31,7 @@ from eos.db.saveddata.drone import drones_table
from eos.db.saveddata.fighter import fighters_table
from eos.db.saveddata.implant import fitImplants_table
from eos.db.saveddata.module import modules_table
from eos.effectHandlerHelpers import HandledDroneCargoList, HandledImplantBoosterList, HandledModuleList, HandledProjectedDroneList, HandledProjectedModList
from eos.effectHandlerHelpers import HandledDroneCargoList, HandledImplantList, HandledBoosterList, HandledModuleList, HandledProjectedDroneList, HandledProjectedModList
from eos.saveddata.booster import Booster
from eos.saveddata.cargo import Cargo
from eos.saveddata.character import Character
@@ -183,7 +183,7 @@ mapper(es_Fit, fits_table,
"shipID": fits_table.c.shipID,
"_Fit__boosters": relation(
Booster,
collection_class=HandledImplantBoosterList,
collection_class=HandledBoosterList,
cascade='all, delete, delete-orphan',
backref='owner',
single_parent=True),
@@ -219,7 +219,7 @@ mapper(es_Fit, fits_table,
primaryjoin=and_(fighters_table.c.fitID == fits_table.c.ID, fighters_table.c.projected == True)), # noqa
"_Fit__implants": relation(
Implant,
collection_class=HandledImplantBoosterList,
collection_class=HandledImplantList,
cascade='all, delete, delete-orphan',
backref='owner',
single_parent=True,

4
eos/db/saveddata/implantSet.py
View File

@@ -23,7 +23,7 @@ import datetime
from eos.db import saveddata_meta
from eos.db.saveddata.implant import implantsSetMap_table
from eos.effectHandlerHelpers import HandledImplantBoosterList
from eos.effectHandlerHelpers import HandledImplantList
from eos.saveddata.implant import Implant
from eos.saveddata.implantSet import ImplantSet
@@ -38,7 +38,7 @@ mapper(ImplantSet, implant_set_table,
properties={
"_ImplantSet__implants": relation(
Implant,
collection_class=HandledImplantBoosterList,
collection_class=HandledImplantList,
cascade='all, delete, delete-orphan',
backref='set',
single_parent=True,