changeset 5392:f579b0ac0f2d

merged
author Eugene Syromyatnikov <evgsyr@gmail.com>
date Mon, 21 Dec 2009 12:50:53 +0300
parents 587747855ee0 (current diff) 8a9f7b812cce (diff)
children 1472141fa7be
files
diffstat 3 files changed, 15 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/AttachFile.py	Mon Dec 21 03:26:22 2009 +0300
+++ b/MoinMoin/action/AttachFile.py	Mon Dec 21 12:50:53 2009 +0300
@@ -664,10 +664,14 @@
             return
 
         if new_attachment_path != attachment_path:
-            # move file
+            filesize = os.path.getsize(attachment_path)
             filesys.rename(attachment_path, new_attachment_path)
             _addLogEntry(request, 'ATTDEL', pagename, attachment)
+            event = FileRemovedEvent(request, pagename, attachment, filesize)
+            send_event(event)
             _addLogEntry(request, 'ATTNEW', new_pagename, new_attachment)
+            event = FileAttachedEvent(request, new_pagename, new_attachment, filesize)
+            send_event(event)
             upload_form(pagename, request,
                         msg=_("Attachment '%(pagename)s/%(filename)s' moved to '%(new_pagename)s/%(new_filename)s'.") % {
                             'pagename': pagename,
--- a/MoinMoin/action/login.py	Mon Dec 21 03:26:22 2009 +0300
+++ b/MoinMoin/action/login.py	Mon Dec 21 12:50:53 2009 +0300
@@ -34,7 +34,8 @@
         _ = self._
         request = self.request
         form = html.FORM(method='POST', name='logincontinue', action=self.pagename)
-        form.append(html.INPUT(type='hidden', name='login', value='login'))
+        form.append(html.INPUT(type='hidden', name='action', value='login'))
+        form.append(html.INPUT(type='hidden', name='login', value='1'))
         form.append(html.INPUT(type='hidden', name='stage',
                                value=request._login_multistage_name))
 
--- a/docs/CHANGES	Mon Dec 21 03:26:22 2009 +0300
+++ b/docs/CHANGES	Mon Dec 21 12:50:53 2009 +0300
@@ -30,6 +30,14 @@
   * Fixed caching of formatted msgs, see MoinMoinBugs/1.9EditPageHelpLinksBroken.
   * highlight parser: fixed caching issue for "toggle line numbers" link.
   * flup based frontends: fixed SCGI and AJP (didn't work).
+  * fix auth methods that use redirects (like openid)
+  * OpenID client:
+    * Add setting cfg.openidrp_allowed_op, default is [].
+    * Fixed logging in with openid and associating with an existing account.
+  * OpenID server:
+    * Fixed TypeError.
+    * Fixed processing POSTed form data AND URL args.
+  * AttachFile.move_file: send events (so e.g. xapian index update happens)
 
   New features:
   * xmlrpc: added renamePage and deleteAttachment methods.