fixed tag bug

Author: wang-yikai

app.py

@@ -505,10 +505,10 @@ def add_tag():
                 cursor.execute(query, (tagee, photoID, True))
                 conn.commit()
             else:
-                query = 'SELECT photoID FROM Photo AS p WHERE p.photoID IN (SELECT photoID FROM Belong NATURAL JOIN Share WHERE username = %s AND accepted = 1) OR (allfollowers = 1 AND EXISTS (SELECT * FROM Follow WHERE followerUsername = %s and followeeUsername = p.photoOwner)) OR (p.photoOwner = %s)'
-                cursor.execute(query, (tagee, tagee, tagee))
+                query = 'SELECT photoID FROM Photo AS p WHERE (p.photoID IN (SELECT photoID FROM Belong NATURAL JOIN Share WHERE username = %s AND accepted = 1) OR (allfollowers = 1 AND EXISTS (SELECT * FROM Follow WHERE followerUsername = %s and followeeUsername = p.photoOwner)) OR (p.photoOwner = %s)) AND (p.photoID = %s)'
+                cursor.execute(query, (tagee, tagee, tagee, photoID))
                 data = cursor.fetchall()
-                # print(data)
+                print(data)
                 # print(data[0]["photoID"])
                 # print(photoID)
                 if len(data) > 0 and int(photoID) == data[0]["photoID"]:

templates/add_tag.html

@@ -31,8 +31,8 @@
 	{% for tagee in requests %}
 		<tr>
 			<td>{{ tagee.username }} on photo {{ tagee.photoID }} by {{ tagee.photoOwner }}</td>
-			<td><a href="/accept_tag/{{ tagee.username }}/{{ photoID }}">Accept</a></td>
-			<td><a href="/reject_tag/{{ tagee.username }}/{{ photoID }}">Reject</a></td>
+			<td><a href="/accept_tag/{{ tagee.username }}/{{ tagee.photoID }}">Accept</a></td>
+			<td><a href="/reject_tag/{{ tagee.username }}/{{ tagee.photoID }}">Reject</a></td>
 		</tr>
 	{% endfor %}
 </table>