diff MoinMoin/action/quicklink.py @ 3059:036fc4dce2ee

fix quicklink action using same URL for link/unlink (thanks to Federico Lorenzi) (ported from 1.6)
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Thu, 21 Feb 2008 20:43:42 +0100
parents ba14d391c2ba
children a1322262398a
line wrap: on
line diff
--- a/MoinMoin/action/quicklink.py	Thu Feb 21 20:37:32 2008 +0100
+++ b/MoinMoin/action/quicklink.py	Thu Feb 21 20:43:42 2008 +0100
@@ -14,16 +14,13 @@
 
     if not request.user.valid:
         request.theme.add_msg(_("You must login to add a quicklink."), "error")
-    elif request.user.isQuickLinkedTo([pagename]):
-        if request.user.removeQuicklink(pagename):
-            request.theme.add_msg(_('Your quicklink to this page has been removed.'), "info")
-        else: # should not happen
-            request.theme.add_msg(_('Your quicklink to this page could not be removed.'), "error")
-    else:
+    elif not request.user.isQuickLinkedTo([pagename]):
         if request.user.addQuicklink(pagename):
             request.theme.add_msg(_('A quicklink to this page has been added for you.'), "info")
         else: # should not happen
             request.theme.add_msg(_('A quicklink to this page could not be added for you.'), "error")
+    else:
+        request.theme.add_msg(_('You already have a quicklink to this page.', formatted=False))
 
     Page(request, pagename).send_page()