README.md
This commit is contained in:
+14
-2
@@ -21,6 +21,15 @@ class User(db.Model):
|
||||
last_login = Column(DateTime, nullable=True)
|
||||
is_active = Column(Boolean, default=True)
|
||||
|
||||
# ТОЛЬКО ЭТИ ПОЛЯ ДЛЯ ПРОФИЛЯ
|
||||
email = Column(String(255), nullable=True)
|
||||
jabber = Column(String(255), nullable=True)
|
||||
updated_at = Column(DateTime, default=datetime.now, onupdate=datetime.now)
|
||||
|
||||
# Настройки уведомлений
|
||||
notify_email = Column(Boolean, default=False)
|
||||
notify_jabber = Column(Boolean, default=False)
|
||||
|
||||
secrets = relationship('Secret', back_populates='user', cascade='all, delete-orphan')
|
||||
security_logs = relationship('SecurityLog', back_populates='user', cascade='all, delete-orphan')
|
||||
|
||||
@@ -40,7 +49,10 @@ class User(db.Model):
|
||||
'role': self.role,
|
||||
'created_at': self.created_at.isoformat() if self.created_at else None,
|
||||
'last_login': self.last_login.isoformat() if self.last_login else None,
|
||||
'is_active': self.is_active
|
||||
'is_active': self.is_active,
|
||||
'email': self.email,
|
||||
'jabber': self.jabber,
|
||||
'updated_at': self.updated_at.isoformat() if self.updated_at else None,
|
||||
}
|
||||
|
||||
|
||||
@@ -174,7 +186,7 @@ def set_user_role(user_id: int, role: str):
|
||||
db.session.commit()
|
||||
|
||||
|
||||
def log_creation(secret_id: str, client_info: dict, user_id: int = None, request_note: str = None):
|
||||
def log_creation(secret_id: str, client_info: dict, user_id: int = None, request_note: str = None, user_note: str = None):
|
||||
secret = Secret(
|
||||
secret_id=secret_id,
|
||||
user_id=user_id,
|
||||
|
||||
Reference in New Issue
Block a user