Add fax phone number to job listing, default private attributes.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10365 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/scheduler/conf.c b/scheduler/conf.c
index e4f11fddd756dcaaeb4f990438c6deff7b3201dc..b9ceac55f8891dd5b022326dd887c59d7e4c1ec4 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -3610,6 +3610,7 @@ read_policy(cups_file_t *fp,              /* I - Configuration file */
              cupsdAddString(&(pol->job_attrs), "job-name");
              cupsdAddString(&(pol->job_attrs), "job-originating-host-name");
              cupsdAddString(&(pol->job_attrs), "job-originating-user-name");
+             cupsdAddString(&(pol->job_attrs), "phone");
            }
            else
              cupsdAddString(&(pol->job_attrs), value);
@@ -3834,6 +3835,7 @@ set_policy_defaults(cupsd_policy_t *pol)/* I - Policy */
     cupsdAddString(&(pol->job_attrs), "job-name");
     cupsdAddString(&(pol->job_attrs), "job-originating-host-name");
     cupsdAddString(&(pol->job_attrs), "job-originating-user-name");
+    cupsdAddString(&(pol->job_attrs), "phone");
   }
 
   if (!pol->sub_access)

diff --git a/templates/jobs.tmpl b/templates/jobs.tmpl
index 625059f621cb2faba38a5e123fdf5ad98e840e06..142fbb243fe762157c177e7bc80d7e856913d4e1 100644 (file)
--- a/templates/jobs.tmpl
+++ b/templates/jobs.tmpl
@@ -6,7 +6,7 @@
 <TBODY>
 {[job_id]
 <TR VALIGN="TOP">
-<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}&nbsp;</TD>
+<TD><A HREF="{job_printer_uri}">{job_printer_name}</A>-{job_id}{?phone? ({phone})}&nbsp;</TD>
 <TD>{?job_name=?Unknown:{job_name}}&nbsp;</TD>
 <TD>{?job_originating_user_name=?Withheld:{job_originating_user_name}}&nbsp;</TD>
 <TD>{job_k_octets}k&nbsp;</TD>