Renamed groups to roles in the frontend

Working:
 Account
 Cost Centre
 Employee
 Product Group
 Product
 Role
 User
 Client
This commit is contained in:
tanshu committed 2020-05-12 01:44:57 +05:30
1 parent cd764be49c
commit 6dbab6442f
50 files changed
+272 -295

No files matched your search

+1 -1
View File
@@ -24,7 +24,7 @@ def get_db():
db.close()
@router.put("/{id_}", response_model=schemas.Client)
@router.put("/{id_}")
def update(
id_: uuid.UUID,
data: schemas.ClientIn,
+6 -6
View File
@@ -24,7 +24,7 @@ def get_db():
db.close()
@router.post("/", response_model=schemas.Role)
@router.post("", response_model=schemas.Role)
def save(
data: schemas.RoleIn,
db: Session = Depends(get_db),
@@ -113,7 +113,7 @@ def delete(
)
@router.get("/")
@router.get("")
def show_blank(
db: Session = Depends(get_db),
user: UserToken = Security(get_user, scopes=["users"]),
@@ -163,10 +163,10 @@ def role_info(item: Optional[Role], db):
"name": item.name,
"permissions": [
{
"id": item.id,
"name": item.name,
"enabled": True if item in item.permissions else False,
"id": p.id,
"name": p.name,
"enabled": True if p in item.permissions else False,
}
for item in db.query(Role).order_by(Role.name).all()
for p in db.query(Permission).order_by(Permission.name).all()
],
}
+4 -4
View File
@@ -24,7 +24,7 @@ def get_db():
db.close()
@router.post("/", response_model=schemas.User)
@router.post("", response_model=schemas.User)
def save(
data: schemas.UserIn,
db: Session = Depends(get_db),
@@ -65,7 +65,7 @@ def update_me(
):
try:
item: User = db.query(User).filter(User.id == user.id_).first()
if "advanced-delete" in user.permissions:
if "users" in user.permissions:
item.name = data.name
item.locked_out = data.locked_out
add_roles(item, data.roles, db)
@@ -151,7 +151,7 @@ def delete(
)
@router.get("/")
@router.get("")
def show_blank(
db: Session = Depends(get_db),
user: UserToken = Security(get_user, scopes=["users"]),
@@ -185,7 +185,7 @@ async def show_active(
]
@router.get("/{id_}", response_model=schemas.Role)
@router.get("/{id_}", response_model=schemas.User)
def show_id(
id_: uuid.UUID,
db: Session = Depends(get_db),