changeset 567:6d062608aab4

Fixed Login hint incorrectly linking to UserPreferences page imported from: moin--main--1.5--patch-571
author Thomas Waldmann <tw@waldmann-edv.de>
date Sat, 15 Apr 2006 15:22:16 +0000
parents f52e03acf42a
children 4fb533df2b39
files ChangeLog MoinMoin/request.py docs/CHANGES
diffstat 3 files changed, 17 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Apr 15 15:13:25 2006 +0000
+++ b/ChangeLog	Sat Apr 15 15:22:16 2006 +0000
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--arch@arch.thinkmo.de--2003-archives/moin--main--1.5
 #
 
+2006-04-15 16:22:16 GMT	Thomas Waldmann <tw@waldmann-edv.de>	patch-571
+
+    Summary:
+      Fixed Login hint incorrectly linking to UserPreferences page
+    Revision:
+      moin--main--1.5--patch-571
+
+    Fixed Login hint incorrectly linking to UserPreferences page
+    
+
+    modified files:
+     ChangeLog MoinMoin/request.py docs/CHANGES
+
+
 2006-04-15 16:13:25 GMT	Alexander Schremmer <alex@alexanderweb.de.tla>	patch-570
 
     Summary:
--- a/MoinMoin/request.py	Sat Apr 15 15:13:25 2006 +0000
+++ b/MoinMoin/request.py	Sat Apr 15 15:22:16 2006 +0000
@@ -1127,9 +1127,7 @@
                     msg = _("You are not allowed to do %s on this page.") % wikiutil.escape(action)
                     if not self.user.valid:
                         # Suggest non valid user to login
-                        login = wikiutil.getSysPage(self, 'UserPreferences')
-                        login = login.link_to(self, _('Login'))
-                        msg += _(" %s and try again.", formatted=0) % login
+                        msg += _(" %s and try again.", formatted=0) % _('Login') # XXX merge into 1 string after 1.5.3 release
                     self.page.send_page(self, msg=msg)
 
                 # Try action
--- a/docs/CHANGES	Sat Apr 15 15:13:25 2006 +0000
+++ b/docs/CHANGES	Sat Apr 15 15:22:16 2006 +0000
@@ -47,6 +47,8 @@
     * Change <p> generation from self-closing (<p />) to auto-closing (only
       emit <p>, let browser find place for </p>).
     * Fix eating of newline before tables.
+    * Fixed incorrect login hint for not logged-in users trying a disallowed
+      action.
 
   Other Changes:
     * We catch and ignore html to wiki conversion errors in case of hitting