From 89f43e79df5047e09828c6669b951c105e35be6c Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Wed, 21 Jun 2023 14:44:26 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A4=9C=E7=B4=A2=E5=BE=8C=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E3=81=AE=E7=89=B9=E6=AE=8A=E8=A8=98=E5=8F=B7=E3=81=8C?= =?UTF-8?q?=E3=82=A8=E3=82=B9=E3=82=B1=E3=83=BC=E3=83=97=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-webapp/src/controller/ultmarc.py | 7 ++++--- ecs/jskult-webapp/src/model/request/ultmarc_inst.py | 7 +++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ecs/jskult-webapp/src/controller/ultmarc.py b/ecs/jskult-webapp/src/controller/ultmarc.py index 5efa8530..8ba036e1 100644 --- a/ecs/jskult-webapp/src/controller/ultmarc.py +++ b/ecs/jskult-webapp/src/controller/ultmarc.py @@ -4,8 +4,8 @@ from fastapi import APIRouter, Depends, Request from src.depends.services import get_service from src.model.internal.session import UserSession -from src.model.request.ultmarc_doctor import ( - UltmarcDoctorInfoModel, UltmarcDoctorSearchModel) +from src.model.request.ultmarc_doctor import (UltmarcDoctorInfoModel, + UltmarcDoctorSearchModel) from src.model.request.ultmarc_inst import (UltmarcInstInfoModel, UltmarcInstSearchModel) from src.router.session_router import AuthenticatedRoute @@ -77,7 +77,8 @@ def search_inst( ultmarc = ultmarc_service.prepare_ultmarc_inst_search_view() ultmarc.is_batch_processing = is_batch_processing ultmarc.inst_data = ultmarc_inst_data - ultmarc.form_data = ultmarc_inst_form + # 画面表示用にエスケープを解除して返す + ultmarc.form_data = ultmarc_inst_form.unescape() # セッション書き換え session.update( diff --git a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py index 7b60bfd9..ba9cce90 100644 --- a/ecs/jskult-webapp/src/model/request/ultmarc_inst.py +++ b/ecs/jskult-webapp/src/model/request/ultmarc_inst.py @@ -1,3 +1,4 @@ +import html from typing import Optional from fastapi import Form @@ -46,6 +47,12 @@ class UltmarcInstSearchModel(BaseModel): pagination_page_number=pagination_page_number ) + def unescape(self): + for k, v in self.dict().items(): + if v is not None and type(v) is str: + setattr(self, k, html.unescape(v)) + return self + class UltmarcInstInfoModel(BaseModel): inst_id: Optional[str]