arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-12-01 04:38:12 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0' into rbac

Browse Source
This commit is contained in:
grossmj 2021-06-01 15:50:14 +09:30
commit e9b9884ee3
4 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gns3server/db/repositories/computes.py
View File

@ -79,7 +79,10 @@ class ComputesRepository(BaseRepository):
if password: if password:
update_values["password"] = password.get_secret_value() update_values["password"] = password.get_secret_value()
query = update(models.Compute).where(models.Compute.compute_id == compute_id).values(update_values) query = update(models.Compute).\
where(models.Compute.compute_id == compute_id).\
values(update_values).\
execution_options(synchronize_session="fetch")
await self._db_session.execute(query) await self._db_session.execute(query)
await self._db_session.commit() await self._db_session.commit()

5
gns3server/db/repositories/templates.py
View File

@ -70,7 +70,10 @@ class TemplatesRepository(BaseRepository):
update_values = template_update.dict(exclude_unset=True) update_values = template_update.dict(exclude_unset=True)
query = update(models.Template).where(models.Template.template_id == template_id).values(update_values) query = not update(models.Template). \
where(models.Template.template_id == template_id). \
values(update_values).\
execution_options(synchronize_session="fetch")
await self._db_session.execute(query) await self._db_session.execute(query)
await self._db_session.commit() await self._db_session.commit()

10
gns3server/db/repositories/users.py
View File

@ -102,7 +102,10 @@ class UsersRepository(BaseRepository):
if password: if password:
update_values["hashed_password"] = self._auth_service.hash_password(password=password.get_secret_value()) update_values["hashed_password"] = self._auth_service.hash_password(password=password.get_secret_value())
query = update(models.User).where(models.User.user_id == user_id).values(update_values) query = update(models.User).\
where(models.User.user_id == user_id).\
values(update_values).\
execution_options(synchronize_session="fetch")
await self._db_session.execute(query) await self._db_session.execute(query)
await self._db_session.commit() await self._db_session.commit()
@ -197,7 +200,10 @@ class UsersRepository(BaseRepository):
""" """
update_values = user_group_update.dict(exclude_unset=True) update_values = user_group_update.dict(exclude_unset=True)
query = update(models.UserGroup).where(models.UserGroup.user_group_id == user_group_id).values(update_values) query = update(models.UserGroup).\
where(models.UserGroup.user_group_id == user_group_id).\
values(update_values).\
execution_options(synchronize_session="fetch")
await self._db_session.execute(query) await self._db_session.execute(query)
await self._db_session.commit() await self._db_session.commit()

10
requirements.txt
View File

@ -1,16 +1,16 @@
uvicorn==0.13.4 uvicorn==0.13.4
fastapi==0.64.0 fastapi==0.65.1
websockets==9.0.1 websockets==9.1
python-multipart==0.0.5 python-multipart==0.0.5
aiohttp==3.7.4.post0 aiohttp==3.7.4.post0
aiofiles==0.6.0 aiofiles==0.7.0
Jinja2==2.11.3 Jinja2==3.0.1
sentry-sdk==1.1.0 sentry-sdk==1.1.0
psutil==5.8.0 psutil==5.8.0
async-timeout==3.0.1 async-timeout==3.0.1
distro==1.5.0 distro==1.5.0
py-cpuinfo==8.0.0 py-cpuinfo==8.0.0
sqlalchemy==1.4.14 sqlalchemy==1.4.17
aiosqlite===0.17.0 aiosqlite===0.17.0
passlib[bcrypt]==1.7.4 passlib[bcrypt]==1.7.4
python-jose==3.2.0 python-jose==3.2.0