Fix corps display on profile (Closes #1168)
authorRaphaël Barrois <raphael.barrois@polytechnique.org>
Sat, 3 Jul 2010 13:50:28 +0000 (15:50 +0200)
committerRaphaël Barrois <raphael.barrois@polytechnique.org>
Fri, 16 Jul 2010 23:10:12 +0000 (01:10 +0200)
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
templates/profile/profile.tpl

index 2da1c39..036ae02 100644 (file)
@@ -177,14 +177,17 @@ function chgMainWinLoc(strPage)
 
       {assign var=corps value=$profile->getCorps()}
       {if $corps && ($corps->current || $corps->original)}
-      <ul>
+        <ul>
         {if $corps->current}
-          <li>Corps actuel&nbsp;: {$corps->current_name} {$corps->current_rank}</li>
+          <li>
+            Corps actuel&nbsp;: {$corps->current_name}
+            {if $corps->current_rank}({$corps->current_rank}){/if}
+          </li>
         {/if}
-        {if $corps->original}
+        {if $corps->current != $corps->original && $corps->original}
           <li>Corps d'origine&nbsp;: {$corps->original_name}</li>
         {/if}
-      </ul>
+        </ul>
       {/if}
 
     </div>