Merge branch 'develop' into feature/pricelist
This commit is contained in:
commit
be1854d7c1
|
@ -65,8 +65,10 @@ class Job(db.Model, ModelSerializeMixin):
|
|||
end: Optional[datetime] = db.Column(UtcDateTime)
|
||||
type: Union[JobType, int] = db.relationship("JobType")
|
||||
comment: Optional[str] = db.Column(db.String(256))
|
||||
locked: bool = db.Column(db.Boolean())
|
||||
services: list[Service] = db.relationship("Service", back_populates="job_")
|
||||
locked: bool = db.Column(db.Boolean(), default=False, nullable=False)
|
||||
services: list[Service] = db.relationship(
|
||||
"Service", back_populates="job_", cascade="save-update, merge, delete, delete-orphan"
|
||||
)
|
||||
required_services: float = db.Column(db.Numeric(precision=4, scale=2, asdecimal=False), nullable=False)
|
||||
|
||||
event_ = db.relationship("Event", back_populates="jobs")
|
||||
|
|
|
@ -15,7 +15,6 @@ from . import event_controller, permissions, EventPlugin
|
|||
from ...utils.HTTP import no_content
|
||||
|
||||
|
||||
|
||||
def dict_get(self, key, default=None, type=None):
|
||||
"""Same as .get from MultiDict"""
|
||||
try:
|
||||
|
@ -510,4 +509,5 @@ def lock_job(job_id, current_session: Session):
|
|||
raise BadRequest
|
||||
return no_content()
|
||||
|
||||
|
||||
# TODO: JobTransfer
|
||||
|
|
Loading…
Reference in New Issue