Changeset 4909

Timestamp:

27 Jan 2010, 13:17:38 (15 years ago)

Author:

uli

Message:

• Fix link to logfile after processing.

• Remove ability to delete logfiles with the UI.

File:

• waeup/trunk/src/waeup/browser/pages.py (modified) (4 diffs)

waeup/trunk/src/waeup/browser/pages.py

@@ -562 +562 @@
 
         if showlog is not None:
-            logfilename = "logs/datacenter.log" # % (self.filename, self.mode)
+            logfilename = "datacenter.log"
             session['logname'] = logfilename
             self.redirect(self.url(self.context, '@@show'))
@@ -593 +593 @@
     pnav = 0
 
-    def update(self, show=None, remove=None, logname=None, back=None):
+    def update(self, show=None, logname=None, back=None):
         session = ISession(self.request)['waeup.sirp']
         if back is not None:
@@ -600 +600 @@
         if logname is not None:
             session['logname'] = logname
-            if remove is not None:
-                fullpath = os.path.join(self.context.storage, logname)
-                try:
-                    os.unlink(fullpath)
-                    self.flash('File %s deleted.' % logname)
-                except:
-                    self.flash("Could not delete %s: " % logname)
-                    self.flash("Problem: %s" % sys.exc_info()[1])
-
         if show is not None:
             self.redirect(self.url(self.context, '@@show'))
@@ -630 +621 @@
         self.filename = logname
         self.files = self.context.getLogFiles()
-        fullpath = os.path.join(self.context.storage, logname)
+        fullpath = os.path.join(self.context.storage, 'logs', logname)
         self.filecontents = open(fullpath, 'rb').read()