From a3ad3d44fc6e428aa466ff5c65079e4461562181 Mon Sep 17 00:00:00 2001 From: Vincent Zanotti Date: Fri, 11 Sep 2009 20:46:18 +0200 Subject: [PATCH] Pushes a parameter name change in the AX profiles URLs. Also fix the multiplication of hard-coded links to that page by channeling everything to /profile/ax. Signed-off-by: Vincent Zanotti --- modules/admin.php | 2 +- modules/marketing.php | 2 +- modules/profile.php | 2 +- modules/profile/general.inc.php | 2 +- templates/admin/dead_but_active.tpl | 3 +-- templates/admin/synchro_ax.tpl | 2 +- templates/include/minifiche.tpl | 2 +- templates/marketing/promo.tpl | 3 +-- templates/profile/general.tpl | 4 ++-- 9 files changed, 10 insertions(+), 12 deletions(-) diff --git a/modules/admin.php b/modules/admin.php index 9918541..b6b4c5c 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -893,7 +893,7 @@ class AdminModule extends PLModule $page->setTitle('Administration - Décédés'); $res = XDB::iterator( - "SELECT u.promo, u.nom, u.prenom, u.deces, u.matricule_ax, u.hruid, DATE(MAX(s.start)) AS last + "SELECT u.promo, u.nom, u.prenom, u.deces, u.hruid, DATE(MAX(s.start)) AS last FROM auth_user_md5 AS u LEFT JOIN logger.sessions AS s ON (s.uid = u.user_id AND suid = 0) WHERE perms IN ('admin', 'user') AND deces <> 0 diff --git a/modules/marketing.php b/modules/marketing.php index baa5eaa..cb280ae 100644 --- a/modules/marketing.php +++ b/modules/marketing.php @@ -258,7 +258,7 @@ class MarketingModule extends PLModule } $page->assign('promo', $promo); - $sql = "SELECT u.user_id, u.nom, u.prenom, u.last_known_email, u.matricule_ax, + $sql = "SELECT u.user_id, u.hruid, u.nom, u.prenom, u.last_known_email, IF(MAX(m.last) > p.relance, MAX(m.last), p.relance) AS dern_rel, p.email FROM auth_user_md5 AS u LEFT JOIN register_pending AS p ON p.uid = u.user_id diff --git a/modules/profile.php b/modules/profile.php index b80d0e2..14b1664 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -311,7 +311,7 @@ class ProfileModule extends PLModule if (!intval($mat)) { $page->kill("Le matricule AX de {$user->login()} est inconnu"); } - http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&anc_id=$mat"); + http_redirect("http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&ancc_id=$mat"); } function handler_p_edit(&$page, $opened_tab = null, $mode = null, $success = null) diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php index d09df85..719f2a0 100644 --- a/modules/profile/general.inc.php +++ b/modules/profile/general.inc.php @@ -127,7 +127,7 @@ class ProfileGeneral extends ProfilePage q.profile_mobile as mobile, q.profile_mobile_pub as mobile_pub, q.profile_web as web, q.profile_web_pub as web_pub, q.profile_freetext as freetext, q.profile_freetext_pub as freetext_pub, - q.profile_nick as nick, q.profile_from_ax as synchro_ax, u.matricule_ax, + q.profile_nick as nick, q.profile_from_ax as synchro_ax, u.hruid, IF(a1.aid IS NULL, -1, a1.aid) as appli_id1, a1.type as appli_type1, IF(a2.aid IS NULL, -1, a2.aid) as appli_id2, a2.type as appli_type2 FROM auth_user_md5 AS u diff --git a/templates/admin/dead_but_active.tpl b/templates/admin/dead_but_active.tpl index b4a80bb..517be7a 100644 --- a/templates/admin/dead_but_active.tpl +++ b/templates/admin/dead_but_active.tpl @@ -39,8 +39,7 @@ {$d.promo} {icon name=user_suit title='Afficher la fiche'} - {* - *}{icon name=user_gray title="fiche AX"} + {icon name=user_gray title="fiche AX"} {icon name=wrench title='Administrer user'} {$d.prenom} {$d.nom} diff --git a/templates/admin/synchro_ax.tpl b/templates/admin/synchro_ax.tpl index 61c2d6b..308d08f 100644 --- a/templates/admin/synchro_ax.tpl +++ b/templates/admin/synchro_ax.tpl @@ -57,7 +57,7 @@
Les fiches de cet utilisateur :
{if $diff} diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl index 511e661..0fd2a14 100644 --- a/templates/include/minifiche.tpl +++ b/templates/include/minifiche.tpl @@ -85,7 +85,7 @@ {/if} {* *}{icon name=wrench title="administrer user"} - {* + {* *}{icon name=user_gray title="fiche AX"}] {/if} diff --git a/templates/marketing/promo.tpl b/templates/marketing/promo.tpl index 44b4775..c945ef4 100644 --- a/templates/marketing/promo.tpl +++ b/templates/marketing/promo.tpl @@ -67,8 +67,7 @@ {icon name=wrench title="Marketing"} - {* - *}{icon name=user_gray title="fiche AX"} + {icon name=user_gray title="fiche AX"} {/iterate} diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl index 86070e6..e255a2c 100644 --- a/templates/profile/general.tpl +++ b/templates/profile/general.tpl @@ -145,10 +145,10 @@

- Le service annuaire de l'AX met à jour l'annuaire papier à partir des informations que tu lui fournis. Tu peux choisir ici d'envoyer directement les données de ta fiche Polytechnique.org vers ta fiche AX. + Le service annuaire de l'AX met à jour l'annuaire papier à partir des informations que tu lui fournis. Tu peux choisir ici d'envoyer directement les données de ta fiche Polytechnique.org vers ta fiche AX.

- L'opération de synchronisation prend en compte toutes les informations que tu as marquées comme transmises à l'AX (en orange ou en vert). Elle peut alors effacer, modifier ou rajouter des informations sur ta fiche AX selon ce qui s'y trouve déjà. + L'opération de synchronisation prend en compte toutes les informations que tu as marquées comme transmises à l'AX (en orange ou en vert). Elle peut alors effacer, modifier ou rajouter des informations sur ta fiche AX selon ce qui s'y trouve déjà.

-- 2.1.4