Merge branch 'master' into persona

This commit is contained in:
Eelco Dolstra
2013-11-06 12:35:36 +01:00
7 changed files with 51 additions and 7 deletions

View File

@@ -71,7 +71,7 @@
<div class="controls">
<select multiple="multiple" name="roles" class="span3" [% IF !c.check_user_roles('admin') %]disabled="disabled"[% END %]>
[% INCLUDE roleoption role="admin" %]
[% INCLUDE roleoption role="create-project" %]
[% INCLUDE roleoption role="create-projects" %]
</select>
</div>
</div>