From: Stéphane Jacob Date: Wed, 26 Oct 2011 15:34:58 +0000 (+0200) Subject: Allows job addresses to be the mail address. X-Git-Tag: xorg/1.1.4~54 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ddc383d52f48f6084a33d45340b364bd1a960d20;p=platal.git Allows job addresses to be the mail address. Signed-off-by: Stéphane Jacob --- diff --git a/classes/address.php b/classes/address.php index af0e2f0..18f752e 100644 --- a/classes/address.php +++ b/classes/address.php @@ -625,14 +625,16 @@ class Address 'request' => $this->request ); - if ($this->type == self::LINK_PROFILE || $this->type == self::LINK_JOB) { - $address['pub'] = $this->pub; + if ($this->type == self::LINK_JOB) { + $address['pub'] = $this->pub; + $address['mail'] = $this->flags->hasFlag('mail'); } if ($this->type == self::LINK_PROFILE) { static $flags = array('current', 'temporary', 'secondary', 'mail', 'cedex', 'deliveryIssue'); foreach ($flags as $flag) { $address[$flag] = $this->flags->hasFlag($flag); } + $address['pub'] = $this->pub; $address['comment'] = $this->comment; $address['phones'] = Phone::formatFormArray($this->phones); } diff --git a/templates/profile/jobs.job.tpl b/templates/profile/jobs.job.tpl index dde72e9..747347b 100644 --- a/templates/profile/jobs.job.tpl +++ b/templates/profile/jobs.job.tpl @@ -194,6 +194,14 @@ {include file="geoloc/form.address.tpl" prefname="`$jobpref`[w_address]" prefid=$jobid address=$job.w_address class="pair"} + + + + + {if $hiddenaddr} Adresse (masquée)