X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fjobs.inc.php;h=e2029085cd40a5656f3974a6e8d33b079702a33a;hb=6c21094e45512da7fb1321a1df4335b1d48ed9bd;hp=d258517dcd7bbfb1b07156befecdb6cd306cb7c7;hpb=b3d5464e39000e3c6fe1ba436751f85972fe9db7;p=platal.git diff --git a/modules/profile/jobs.inc.php b/modules/profile/jobs.inc.php index d258517..e202908 100644 --- a/modules/profile/jobs.inc.php +++ b/modules/profile/jobs.inc.php @@ -92,7 +92,7 @@ class ProfileSettingJob implements ProfileSetting } $it = Phone::iterate(array($page->pid()), array(Phone::LINK_JOB)); while ($phone = $it->next()) { - $jobs[$phone->linkId()]['w_phone'][$phone->id()] = $phone->toFormArray(); + $jobs[$phone->link_id]['w_phone'][$phone->id] = $phone->toFormArray(); } $res = XDB::iterator("SELECT e.jtid, e.full_name, j.jid FROM profile_job_term_enum AS e @@ -224,11 +224,16 @@ class ProfileSettingJob implements ProfileSetting } if (isset($job['removed']) && $job['removed']) { - if ($job['name'] == '' && $entreprise && isset($entreprise[$entr_val - 1])) { - $entreprise[$entr_val - 1]->clean(); + if (S::user()->checkPerms('directory_ax') + && (Phone::hasPrivate($job['w_phone']) || Address::hasPrivate($job['w_address']) || $job['w_email_pub'] == 'private')) { + Platal::page()->trigWarning("L'entreprise ne peut être supprimée car elle contient des informations pour lesquelles vous n'avez le droit d'édition."); + } else { + if ($job['name'] == '' && $entreprise && isset($entreprise[$entr_val - 1])) { + $entreprise[$entr_val - 1]->clean(); + } + unset($value[$key]); + continue; } - unset($value[$key]); - continue; } if (!isset($job['pub']) || !$job['pub']) { $job['pub'] = 'private';