mirror/mylar
1
0
Fork 0
mirror of https://github.com/evilhero/mylar synced 2025-03-10 05:52:48 +00:00
Code Issues Releases Wiki Activity

Fix: search results with an & would error out, added escape char (thnx ClayM) (#152)

Browse source
This commit is contained in:
evilhero 2013-01-14 00:42:03 -05:00
parent aaa4891343
commit 7403e7bcf2
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/interfaces/default/searchfix.html
View file

@ -69,7 +69,7 @@
<td id="comicname"><a href="${result['ComicURL']}" title="${result['ComicName']}" target="_blank">${result['ComicName']}</td> <td id="comicname"><a href="${result['ComicURL']}" title="${result['ComicName']}" target="_blank">${result['ComicName']}</td>
<td id="comicissues"><title="${result['ComicYear']}">${result['ComicYear']}</td> <td id="comicissues"><title="${result['ComicYear']}">${result['ComicYear']}</td>
<td id="comicissues">${result['ComicIssues']}</td> <td id="comicissues">${result['ComicIssues']}</td>
<td id="addcomic"><a href="from_Exceptions?comicid=${result['ComicID']}&comicname=${result['ComicName']}&comicyear=${result['ComicYear']}&comicissues=${result['ComicIssues']}&comicpublisher=${result['ComicPublisher']}&gcdid=${result['GCDID']}"><span class="ui-icon-plus"></span>Add Series</a></td> <td id="addcomic"><a href="from_Exceptions?comicid=${result['ComicID']}&comicname=${result['ComicName'] |u}&comicyear=${result['ComicYear']}&comicissues=${result['ComicIssues']}&comicpublisher=${result['ComicPublisher']}&gcdid=${result['GCDID']}"><span class="ui-icon-plus"></span>Add Series</a></td>
</tr> </tr>
%endfor %endfor
%else: %else:
@ -83,8 +83,6 @@
</table> </table>
<form action="error_change" method="GET"> <form action="error_change" method="GET">
<input type="hidden" name="comicid" value=${comicid}> <input type="hidden" name="comicid" value=${comicid}>
<input type="hidden" name="comicyear" value=${comicyear}>
<input type="hidden" name="comicissues" value=${comicissues}>
<div><br/> <div><br/>
<label><center><strong>Didn't get it right? Enter what it should be (or the GCD-ID) here:</strong></label></center> <label><center><strong>Didn't get it right? Enter what it should be (or the GCD-ID) here:</strong></label></center>
<center><input type="text" name="errorgcd" size="30"><input type="submit" value="Update"/></center> <center><input type="text" name="errorgcd" size="30"><input type="submit" value="Update"/></center>

7
data/interfaces/default/searchresults.html
View file

@ -31,11 +31,8 @@
<td class="publisher">${result['publisher']}</a></td> <td class="publisher">${result['publisher']}</a></td>
<td class="comicyear">${result['comicyear']}</a></td> <td class="comicyear">${result['comicyear']}</a></td>
<td class="issues">${result['issues']}</td> <td class="issues">${result['issues']}</td>
%if type == 'album':
<td class="add" nowrap="nowrap"><a href="addReleaseById?rid=${result['albumid']}"><span class="ui-icon ui-icon-plus"></span> Add this album</a></td> <td class="add" nowrap="nowrap"><a href="addComic?comicid=${result['comicid']}&comicname=${result['name'] |u}&comicyear=${result['comicyear']}&comicpublisher=${result['publisher']}&comicimage=${result['comicimage']}&comicissues=${result['issues']}"><span class="ui-icon ui-icon-plus"></span> Add this Comic</a></td>
%else:
<td class="add" nowrap="nowrap"><a href="addComic?comicid=${result['comicid']}&comicname=${result['name']}&comicyear=${result['comicyear']}&comicpublisher=${result['publisher']}&comicimage=${result['comicimage']}&comicissues=${result['issues']}"><span class="ui-icon ui-icon-plus"></span> Add this Comic</a></td>
%endif
</tr> </tr>
%endfor %endfor
%endif %endif

2
mylar/webserve.py
View file

@ -133,7 +133,7 @@ class WebInterface(object):
'GCDID' : stoopie['GCDID'] 'GCDID' : stoopie['GCDID']
}) })
i+=1 i+=1
return serve_template(templatename="searchfix.html", title="Error Check", comicname=comicname, comicid=comicid, comicyear=comicyear, comicimage=comicimage, comicissues=comicissues,cresults=cresults) return serve_template(templatename="searchfix.html", title="Error Check", comicname=comicname, comicid=comicid, comicyear=comicyear, comicimage=comicimage, comicissues=comicissues, cresults=cresults)
else: else:
nomatch = "false" nomatch = "false"
logger.info(u"Quick match success..continuing.") logger.info(u"Quick match success..continuing.")