arno/isso
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix/notify-links'

Browse Source
This commit is contained in:
Martin Zimmermann 2013-11-21 11:17:18 +01:00
commit 1541cc90a9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
isso/ext/notifications.py
View File

@ -96,10 +96,10 @@ class SMTP(object):
key = self.isso.sign(comment["id"])
rv.write("---\n")
rv.write("Kommentar löschen: %s\n" % (uri + "/delete/" + key))
rv.write("Delete comment: %s\n" % (uri + "/delete/" + key))
if comment["mode"] == 2:
rv.write("Kommentar freischalten: %s\n" % (uri + "/activate/" + key))
rv.write("Activate comment: %s\n" % (uri + "/activate/" + key))
rv.seek(0)
return rv.read()

3
isso/views/comments.py
View File

@ -47,6 +47,7 @@ class API(object):
('edit', ('PUT', '/id/<int:id>')),
('delete', ('DELETE', '/id/<int:id>')),
('delete', ('GET', '/id/<int:id>/delete/<string:key>')),
('activate',('GET', '/id/<int:id>/activate/<string:key>')),
('like', ('POST', '/id/<int:id>/like')),
('dislike', ('POST', '/id/<int:id>/dislike')),
('checkip', ('GET', '/check-ip'))
@ -253,7 +254,7 @@ class API(object):
resp.headers.add("X-Set-Cookie", cookie("isso-%i" % id))
return resp
def activate(self, environ, request, _, key):
def activate(self, environ, request, id, key):
try:
id = self.isso.unsign(key, max_age=2**32)