チャンネル情報の編集ができなかったのを修正。

plonk · Feb 23, 2022 · 5c94775 · 5c94775
1 parent 463ed03
commit 5c94775
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/core/common/servhs.cpp b/core/common/servhs.cpp
@@ -2446,7 +2446,7 @@ void Servent::handshakeLocalFile(const char *fn, HTTP& http)
 
             auto ch = chanMgr->findChannelByID(GnuID(id.c_str()));
             locals.vars["channel"] = ch ? ch->getState() : nullptr;
-        }else if (str::contains(fn, "connections.html"))
+        }else if (str::contains(fn, "connections.html") || str::contains(fn, "editinfo.html"))
         {
             auto vec = str::split(fn, "?");
             if (vec.size() == 2)

diff --git a/ui/html-master/editinfo.html b/ui/html-master/editinfo.html
@@ -21,10 +21,10 @@
   }
 </script>
 
-{@if page.channel.exist}
+{@if channel}
   <form action="/admin" method="GET">
     <input type="hidden" name="cmd" value="update_channel_info">
-    <input type="hidden" name="id" value="{$page.channel.id}">
+    <input type="hidden" name="id" value="{$channel.id}">
 
     <table align=center border=0>
       <tr align=middle bgcolor=#ccc>
@@ -33,24 +33,24 @@
       <tr align=left bgcolor=#eee>
         <td style="min-width: 90px">{#Name}</td>
         <td style="min-width: 300px">
-          <input type="text" name="name" value="{$page.channel.name}">
+          <input type="text" name="name" value="{$channel.name}">
         </td>
       </tr>
       <tr align=left bgcolor=#ddd>
         <td>{#Genre}</td>
-        <td><input type="text" name="genre" value="{$page.channel.genre}"></td>
+        <td><input type="text" name="genre" value="{$channel.genre}"></td>
       </tr>
       <tr align=left bgcolor=#eee>
         <td>{#Desc.}</td>
-        <td><input type="text" name="desc" value="{$page.channel.desc}"></td>
+        <td><input type="text" name="desc" value="{$channel.desc}"></td>
       </tr>
       <tr align=left bgcolor=#ddd>
         <td>{#URL}</td>
-        <td><input type="text" name="contactURL" value="{$page.channel.contactURL}"></td>
+        <td><input type="text" name="contactURL" value="{$channel.contactURL}"></td>
       </tr>
       <tr align=left bgcolor=#eee>
         <td>{#Comment}</td>
-        <td><input type="text" name="comment" value="{$page.channel.comment}"></td>
+        <td><input type="text" name="comment" value="{$channel.comment}"></td>
       </tr>
       <tr align=left bgcolor=#ccc>
         <td colSpan=2 align=middle>
@@ -63,24 +63,24 @@
       <tr align=left bgcolor=#ddd>
         <td style="min-width: 90px">{#Artist}</td>
         <td style="min-width: 300px">
-          <input type="text" name="track.artist" value="{$page.channel.track.artist}">
+          <input type="text" name="track.artist" value="{$channel.track.artist}">
         </td>
       </tr>
       <tr align=left bgcolor=#eee>
         <td>{#Title}</td>
-        <td><input type="text" name="track.title" value="{$page.channel.track.title}"></td>
+        <td><input type="text" name="track.title" value="{$channel.track.title}"></td>
       </tr>
       <tr align=left bgcolor=#ddd>
         <td>{#Album}</td>
-        <td><input type="text" name="track.album" value="{$page.channel.track.album}"></td>
+        <td><input type="text" name="track.album" value="{$channel.track.album}"></td>
       </tr>
       <tr align=left bgcolor=#eee>
         <td>{#Genre}</td>
-        <td><input type="text" name="track.genre" value="{$page.channel.track.genre}"></td>
+        <td><input type="text" name="track.genre" value="{$channel.track.genre}"></td>
       </tr>
       <tr align=left bgcolor=#ddd>
         <td>{#Contact}</td>
-        <td><input type="text" name="track.contactURL" value="{$page.channel.track.contactURL}"></td>
+        <td><input type="text" name="track.contactURL" value="{$channel.track.contactURL}"></td>
       </tr>
     </table>
     <div style="text-align: center; margin: 15px 0 15px 0">
@@ -91,5 +91,5 @@
   <p style="text-align: center">
     {#Channel not found.}
   </p>
-{@end} <!-- if page.channel.exit -->
+{@end}
 </div>