Remove no-longer-needed tagid from SELECT blocktag

AmselOwl · Nov 6, 2024 · 8cc5011 · 8cc5011
1 parent d70c74d
commit 8cc5011
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/weasyl/blocktag.py b/weasyl/blocktag.py
@@ -56,8 +56,7 @@ def select(userid):
     return [{
         "title": i[0],
         "rating": i[1],
-        "tagid": i[2],
-    } for i in d.execute("SELECT st.title, bt.rating, bt.tagid FROM searchtag st "
+    } for i in d.execute("SELECT st.title, bt.rating FROM searchtag st "
                          " INNER JOIN blocktag bt ON st.tagid = bt.tagid"
                          " WHERE bt.userid = %i"
                          " ORDER BY st.title", [userid])]

diff --git a/weasyl/templates/manage/tagfilters.html b/weasyl/templates/manage/tagfilters.html
@@ -36,21 +36,20 @@ <h3>Blocked Tags</h3>
         </thead>
         <tbody>
           $for i in blocktag:
-            $ tagid = i['tagid']
             $ title = i['title']
             <tr>
               <td>
                 <label>
-                  <input id="select-tag-${tagid}" type="checkbox" name="title" value="${title}" />
+                  <input id="select-tag-${title}" type="checkbox" name="title" value="${title}" />
                 </label>
               </td>
               <td>
-                <label for="select-tag-${tagid}">
+                <label for="select-tag-${title}">
                   ${title}
                 </label>
               </td>
               <td>
-                <label for="select-tag-${tagid}">
+                <label for="select-tag-${title}">
                   ${R.CODE_MAP[i['rating']].nice_name}${'+' if i['rating'] != R.EXPLICIT.code else ''}
                 </label>
               </td>