- Timestamp:
- 15/12/08 09:22:56 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
MILK/trunk/milk_server/milk_server/controllers/atom_editor/editatom.py
r4594 r4625 14 14 from milk_server.models.form import * 15 15 from milk_server.lib import mailer 16 from milk_server.lib.ndgInterface import interface16 from milk_server.lib.ndgInterface import ndgInterface 17 17 import milk_server.lib.htmlUtilities as utils 18 18 from milk_server.lib.atomutilities import savePageAndRender … … 273 273 # quite a lot during editing; ensure you've always got 274 274 # the latest updates loaded 275 interface = ndgInterface() 275 276 status,x = interface.GetXML(uri, useCache=False) 276 277 … … 305 306 c.errors = {} 306 307 307 try: 308 # NB, can get here directly from saveAtom - if there have been errors 309 # - in this case keep original data 310 if not c.atom: 311 self.prepareDataModel(uri) 312 except SystemError, e: 313 return self.__handleError(e) 308 # NB, can get here directly from saveAtom - if there have been errors 309 # - in this case keep original data 310 if not c.atom: 311 self.prepareDataModel(uri) 314 312 315 313 c.title='Editing [%s]' %c.atom.ndgURI … … 367 365 ''' 368 366 logging.info("Setting up atom edit template") 369 self.prepareEditForm(uri)370 371 367 try: 368 self.prepareEditForm(uri) 372 369 return savePageAndRender(self.pathInfo, "atom_editor/atom_editor") 373 370 … … 376 373 c.doc=str(x) 377 374 logging.error("Error retrieving [%s] - XML content: %s" % (uri, e)) 378 375 except SystemError, e: 376 return self.__handleError(e) 379 377 except Exception, e: 380 378 errorMessage = traceback.format_exc()
Note: See TracChangeset
for help on using the changeset viewer.