Changeset 2287

Timestamp:

06/08/05 09:19:43 (19 years ago)

Author:

jerome

Message:

Now stores 'hidden' in the title, filename and options fields instead of the
sentence "Hidden because of privacy concerns". When the history is retrieved,
'hidden' is automatically transformed into this sentence, translated into
the final user's preferred language. This effectively delays the translation
until the message is needed, and allows the database to be consitent when
different users with different locales use the system.

Location:

pykota/trunk/pykota/storages

Files:

• ldapstorage.py (modified) (3 diffs)
• sql.py (modified) (3 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -541 +541 @@
                 lastjob.JobMD5Sum = fields.get("pykotaMD5Sum", [None])[0]
                 lastjob.JobPages = fields.get("pykotaPages", [""])[0]
+                if lastjob.JobTitle == lastjob.JobFileName == lastjob.JobOptions == "hidden" :
+                    (lastjob.JobTitle, lastjob.JobFileName, lastjob.JobOptions) = (_("Hidden because of privacy concerns"),) * 3
                 date = fields.get("createTimestamp", ["19700101000000"])[0]
                 year = int(date[:4])
@@ -946 +948 @@
         if self.privacy :    
             # For legal reasons, we want to hide the title, filename and options
-            title = filename = options = _("Hidden because of privacy concerns")
+            title = filename = options = "hidden"
         fields = {
                    "objectClass" : ["pykotaObject", "pykotaJob"],
@@ -1103 +1105 @@
                 job.JobMD5Sum = fields.get("pykotaMD5Sum", [None])[0]
                 job.JobPages = fields.get("pykotaPages", [""])[0]
+                if job.JobTitle == job.JobFileName == job.JobOptions == "hidden" :
+                    (job.JobTitle, job.JobFileName, job.JobOptions) = (_("Hidden because of privacy concerns"),) * 3
                 date = fields.get("createTimestamp", ["19700101000000"])[0]
                 year = int(date[:4])

pykota/trunk/pykota/storages/sql.py

@@ -266 +266 @@
             lastjob.JobPages = fields.get("pages")
             lastjob.JobBillingCode = self.databaseToUserCharset(fields.get("billingcode"))
+            if lastjob.JobTitle == lastjob.JobFileName == lastjob.JobOptions == "hidden" :
+                (lastjob.JobTitle, lastjob.JobFileName, lastjob.JobOptions) = (_("Hidden because of privacy concerns"),) * 3
             lastjob.Exists = 1
         return lastjob
@@ -464 +466 @@
         if self.privacy :    
             # For legal reasons, we want to hide the title, filename and options
-            title = filename = options = _("Hidden because of privacy concerns")
+            title = filename = options = "hidden"
         filename = self.userCharsetToDatabase(filename)
         title = self.userCharsetToDatabase(title)
@@ -552 +554 @@
                 job.UserName = fields.get("username")
                 job.PrinterName = fields.get("printername")
+                if job.JobTitle == job.JobFileName == job.JobOptions == "hidden" :
+                    (job.JobTitle, job.JobFileName, job.JobOptions) = (_("Hidden because of privacy concerns"),) * 3
                 job.Exists = 1
                 jobs.append(job)