fix: notice editor

GZTimeWalker · Feb 8, 2024 · a6c2f60 · a6c2f60
1 parent 4d273c7
commit a6c2f60
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/GZCTF/ClientApp/src/components/admin/GameNoticeEditCard.tsx b/src/GZCTF/ClientApp/src/components/admin/GameNoticeEditCard.tsx
@@ -22,7 +22,7 @@ const GameNoticeEditCard: FC<GameNoticeEditCardProps> = ({
     <Card {...props} shadow="sm" p="sm">
       <Group position="apart" noWrap>
         <Stack spacing={1}>
-          <InlineMarkdownRender source={gameNotice.content} />
+          <InlineMarkdownRender source={gameNotice.values.at(-1) || ''} />
           <Text size="xs" fw={700} c="dimmed">
             {dayjs(gameNotice.time).format('#YY/MM/DD HH:mm:ss')}
           </Text>

diff --git a/src/GZCTF/ClientApp/src/components/admin/GameNoticeEditModal.tsx b/src/GZCTF/ClientApp/src/components/admin/GameNoticeEditModal.tsx
@@ -18,12 +18,12 @@ const GameNoticeEditModal: FC<GameNoticeEditModalProps> = (props) => {
   const numId = parseInt(id ?? '-1')
   const { gameNotice, mutateGameNotice, ...modalProps } = props
 
-  const [content, setContent] = useState<string>(gameNotice?.content || '')
+  const [content, setContent] = useState<string>(gameNotice?.values.at(-1) || '')
   const [disabled, setDisabled] = useState(false)
   const { t } = useTranslation()
 
   useEffect(() => {
-    setContent(gameNotice?.content || '')
+    setContent(gameNotice?.values.at(-1) || '')
   }, [gameNotice])
 
   const onConfirm = () => {
@@ -35,7 +35,7 @@ const GameNoticeEditModal: FC<GameNoticeEditModalProps> = (props) => {
       })
       return
     }
-    if (content === gameNotice?.content) {
+    if (content === gameNotice?.values.at(-1)) {
       showNotification({
         color: 'orange',
         message: t('common.error.no_change'),