inpt/ponytracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge user / group / team permissions

Browse source
This commit is contained in:
Élie Bouttier 2014-08-30 19:08:14 -07:00
parent f0c6691df2
commit 81df233d5a
6 changed files with 61 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
templates/base.html
View file

@ -71,7 +71,7 @@
</ul>
<ul class="nav navbar-nav navbar-right">
{% if request.user.is_authenticated %}
{% if perm.manage_settings or perm.manage_user or perm_manage_group or perm.manage_team or perm.manage_global_permission %}
{% if perm.manage_settings or perm.manage_accounts or perm.manage_global_permission %}
<li{% block admintab %}{% endblock %}><a href="{% url 'admin' %}" rel="tooltip" data-toggle="tooltip" data-placement="bottom" title="Administration"><span class="glyphicon glyphicon-cog"></span></a></li>
{% endif %}
<li{% block profiletab %}{% endblock %}><a href="{% url 'profile' %}" rel="tooltip" data-toggle="tooltip" data-placement="bottom" title="Profile"><span class="glyphicon glyphicon-user"></span> {{ request.user }}</a></li>

6
templates/base_admin.html
View file

@ -10,13 +10,9 @@
{% if perm.manage_settings %}
<li{% block settingtab %}{% endblock %}><a href="{% url 'settings' %}"><b>Settings</b></a></li>
{% endif %}
{% if perm.manage_user %}
{% if perm.manage_accounts %}
<li{% block usertab %}{% endblock %}><a href="{% url 'list-user' %}"><b>User</b></a></li>
{% endif %}
{% if perm.manage_group %}
<li{% block grouptab %}{% endblock %}><a href="{% url 'list-group' %}"><b>Group</b></a></li>
{% endif %}
{% if perm.manage_team %}
<li{% block teamtab %}{% endblock %}><a href="{% url 'list-team' %}"><b>Team</b></a></li>
{% endif %}
{% if perm.manage_global_permission %}

12
templates/permissions/global_perm_list.html
View file

@ -55,16 +55,8 @@
<a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'manage-settings' %}">{{ perm.manage_settings|boolean }}</a>
</li>
<li class="list-group-item">
Manage users
<a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'manage-user' %}">{{ perm.manage_user|boolean }}</a>
</li>
<li class="list-group-item">
Manage groups
<a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'manage-group' %}">{{ perm.manage_group|boolean }}</a>
</li>
<li class="list-group-item">
Manage teams
<a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'manage-team' %}">{{ perm.manage_team|boolean }}</a>
Manage users, groups and teams
<a href="javascript:void(0);" class="pull-right perm-toggle" data-href="{% url 'toggle-global-permission' perm.id 'manage-accounts' %}">{{ perm.manage_accounts|boolean }}</a>
</li>
<li class="list-group-item">
Manage permissions