[Moin-devel] CVS: MoinMoin PageEditor.py,1.2,1.3 wikiaction.py,1.64,1.65

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin
In directory usw-pr-cvs1:/tmp/cvs-serv21749

Modified Files:
	PageEditor.py wikiaction.py 
Log Message:
send_editor() takes a request object


Index: PageEditor.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/PageEditor.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** PageEditor.py	16 Apr 2002 21:03:33 -0000	1.2
--- PageEditor.py	16 Apr 2002 21:12:03 -0000	1.3
***************
*** 11,15 ****
  import cStringIO, os, re, sys, string, time, urllib
  from MoinMoin import caching, config, eventlog, user, util, wikiutil, webapi
- from MoinMoin.cgimain import request
  from MoinMoin.Page import Page
  from MoinMoin.i18n import _
--- 11,14 ----
***************
*** 33,37 ****
  
  
!     def send_editor(self, form, **kw):
          """ Send the editor form page.
  
--- 32,36 ----
  
  
!     def send_editor(self, request, **kw):
          """ Send the editor form page.
  
***************
*** 45,48 ****
--- 44,49 ----
          except ImportError:
              SpellCheck = None
+ 
+         form = request.form
  
          # check edit permissions

Index: wikiaction.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/wikiaction.py,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** wikiaction.py	16 Apr 2002 21:03:34 -0000	1.64
--- wikiaction.py	16 Apr 2002 21:12:06 -0000	1.65
***************
*** 394,398 ****
  def do_edit(pagename, request):
      from MoinMoin.PageEditor import PageEditor
!     PageEditor(pagename).send_editor(request.form)
  
  
--- 394,398 ----
  def do_edit(pagename, request):
      from MoinMoin.PageEditor import PageEditor
!     PageEditor(pagename).send_editor(request)
  
  
***************
*** 430,434 ****
      if request.form.has_key('button_preview') or request.form.has_key('button_spellcheck') \
              or request.form.has_key('button_newwords'):
!         pg.send_editor(request.form, preview=1, comment=comment)
      elif request.form.has_key('button_cancel'):
          pg.send_page(request.form, msg=_('Edit was cancelled.'))
--- 430,434 ----
      if request.form.has_key('button_preview') or request.form.has_key('button_spellcheck') \
              or request.form.has_key('button_newwords'):
!         pg.send_editor(request, preview=1, comment=comment)
      elif request.form.has_key('button_cancel'):
          pg.send_page(request.form, msg=_('Edit was cancelled.'))