From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 12 Feb 2011 11:19:38 +0000 (+0100)
Subject: Merge remote branch 'origin/xorg/maint' into xorg/master
X-Git-Tag: xorg/1.1.0~152
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=6c21094e45512da7fb1321a1df4335b1d48ed9bd;p=platal.git

Merge remote branch 'origin/xorg/maint' into xorg/master

Conflicts:
	templates/xnetgrp/membres-edit.tpl

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

6c21094e45512da7fb1321a1df4335b1d48ed9bd
diff --cc templates/xnetgrp/membres-edit.tpl
index ca37807,a9c2ea5..92a3833
--- a/templates/xnetgrp/membres-edit.tpl
+++ b/templates/xnetgrp/membres-edit.tpl
@@@ -76,20 -76,7 +76,20 @@@
          </select>
        </td>
      </tr>
 +    <tr class="pair">
 +      <td class="titre">
 +        Poste&nbsp;:
 +      </td>
 +      <td>
 +        <select name="group_position">
 +          <option value=""{if $user->group_position eq ''} selected="selected"{/if}></option>
 +          {foreach from=$positions item=position}
 +          <option value="{$position}"{if $user->group_position eq $position} selected="selected"{/if}>{$position}</option>
 +          {/foreach}
 +        </select>
 +      </td>
 +    </tr>
-     {if !$user->profile()}
+     {if $user->type eq 'virtual' || $user->type eq 'xnet'}
      <tr class="impair">
        <td class="titre">
          Type d'utilisateur&nbsp;: