From: Anne Limoges <anne.limoges_git@polytechnique.org>
Date: Sat, 21 Jun 2014 14:52:29 +0000 (+0200)
Subject: Fix links to profile page.
X-Git-Tag: xorg/1.1.13~1
X-Git-Url: http://git.polytechnique.org/?p=platal.git;a=commitdiff_plain;h=2743241f94fd41c72776e3cb7d45f8c4056db6df

Fix links to profile page.
---

diff --git a/modules/fusionax.php b/modules/fusionax.php
index 1fbfc49..6eb27a1 100644
--- a/modules/fusionax.php
+++ b/modules/fusionax.php
@@ -310,7 +310,7 @@ class FusionAxModule extends PLModule
      * (mises à part les promo 1921, 1922, 1923, 1924, 1925, 1927, 1928, 1929 qui ne figurent pas dans les données de l'AX)*/
     private static function find_wrong_in_xorg($limit = 10)
     {
-        return XDB::iterator('SELECT  u.promo, u.pid, u.private_name
+        return XDB::iterator('SELECT  u.promo, u.pid, u.private_name, u.ax_id
                                 FROM  fusionax_xorg_anciens AS u
                                WHERE  NOT EXISTS (SELECT  *
                                                     FROM  fusionax_anciens AS f
diff --git a/templates/fusionax/idswrongInXorg.tpl b/templates/fusionax/idswrongInXorg.tpl
index dd9dc46..5258979 100644
--- a/templates/fusionax/idswrongInXorg.tpl
+++ b/templates/fusionax/idswrongInXorg.tpl
@@ -26,7 +26,7 @@ dans la base de l'AX (mises à part les promo 1921, 1922, 1923, 1924, 1925, 1927
 <p></p>
 
 {if t($wrongInXorg)}
-{include file='fusionax/listFusion.tpl' fusionList=$wrongInXorg field1='pid' namefield1='ID X.org'}
+{include file='fusionax/listFusion.tpl' fusionList=$wrongInXorg field1='pid' namefield1='X.org' field2='ax_id' namefield2='AX'}
 
 <p><a href="fusionax/ids/cleanwronginxorg">Mettre à NULL le matricule_ax de ces camarades pour marquer le fait qu'ils ne figurent pas dans l'annuaire de l'AX</a></p>
 {/if}
diff --git a/templates/fusionax/listFusion.tpl b/templates/fusionax/listFusion.tpl
index 1b61c9e..b6f7c26 100644
--- a/templates/fusionax/listFusion.tpl
+++ b/templates/fusionax/listFusion.tpl
@@ -45,7 +45,7 @@
     <tr class="{cycle values="pair,impair"}">
         <td>{$c.private_name} ({$c.promo})</td>
         <td style="text-align:center">
-            {if t($c.pid)}<a href="admin/user/{$c.pid}" class="popup2">{icon name="user_suit" title="Administrer utilisateur"}</a>{/if}
+            {if t($c.pid)}<a href="profile/{$c.pid}" class="popup2">{icon name="user_suit" title="Administrer utilisateur"}</a>{/if}
             {if t($c.ax_id)}<a href="http://kx.polytechniciens.com/?page=AX_FICHE_ANCIEN&amp;ancc_id={$c.ax_id}" class="popup2">{icon name="user_gray" title="fiche AX"}</a>{/if}
         </td>
         {if t($field1)}