Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 93d0ec10

Přidáno uživatelem Matěj Zeman před asi 2 roky(ů)

re #9846 Filter text fields keeps their searched content.

Zobrazit rozdíly:

server/sql_app/api/ld_logs_web.py
46 46
    licenses = crud.get_licenses(db, skip=skip, limit=limit)
47 47
    if current_user == "admin":
48 48
        return templates.TemplateResponse("ldlogs.html", {"request": request, "logs": logs, "pcs": pc_obj, "teams": teams,
49
                                                          "licenses": licenses, "user": current_user})
49
                                                          "licenses": licenses, "user": current_user, "pc_val": "",
50
                                                          "team_val": "", "lic_val": ""})
50 51
    else:
51 52
        current_user = "guest"
52 53
        return templates.TemplateResponse("ldlogs_normal.html",
53 54
                                          {"request": request, "logs": logs, "pcs": pc_obj, "teams": teams,
54
                                           "licenses": licenses, "user": current_user})
55
                                           "licenses": licenses, "user": current_user, "pc_val": "",
56
                                                          "team_val": "", "lic_val": ""})
55 57

  
56 58

  
57 59
@ldlogs_web.post("/ldlogs-web", response_class=HTMLResponse)
......
71 73
    pc_obj = crud.get_pcs(db, skip=skip, limit=limit)
72 74
    teams = crud.get_teams(db, skip=skip, limit=limit)
73 75
    licenses = crud.get_licenses(db, skip=skip, limit=limit)
76
    if team == "all":
77
        team = ""
78
    if pc == "all":
79
        pc = ""
80
    if lic == "all":
81
        lic = ""
74 82
    if current_user == "admin":
75 83
        return templates.TemplateResponse("ldlogs.html", {"request": request, "logs": logs, "pcs": pc_obj, "teams": teams,
76
                                                          "licenses": licenses, "user": current_user})
84
                                                          "licenses": licenses, "user": current_user, "pc_val": pc,
85
                                                          "team_val": team, "lic_val": lic})
77 86
    else:
78 87
        current_user = "guest"
79 88
        return templates.TemplateResponse("ldlogs_normal.html",
80 89
                                          {"request": request, "logs": logs, "pcs": pc_obj, "teams": teams,
81
                                           "licenses": licenses, "user": current_user})
90
                                           "licenses": licenses, "user": current_user, "pc_val": pc,
91
                                                          "team_val": team, "lic_val": lic})

Také k dispozici: Unified diff