fix context name conflict in template

permissions/views.py

@@ -37,7 +37,7 @@ def global_perm_edit(request, id=None):
         else:
             name = ''
     return render(request, 'permissions/global_perm_edit.html', {
-        'perm': perm,
+        'permission': perm,
         'form': form,
         'name': name,
     })
@@ -101,7 +101,7 @@ def project_perm_edit(request, project, id=None):
             name = ''
     return render(request, 'permissions/project_perm_edit.html', {
         'project': project,
-        'perm': perm,
+        'permission': perm,
         'form': form,
         'name': name,
     })

templates/permissions/global_perm_edit.html

@@ -9,9 +9,7 @@
 {% block permtab %} class="active"{% endblock %}
 
 {% block moretabs %}
-  <div class="pull-right">
-    <a href="#" data-action="{% url 'add-global-permission' %}" data-toggle="modal" data-target="#add-perm-form-modal" class="btn btn-success">Add permission</a>
-  </div>
+<a href="#" data-action="{% url 'add-global-permission' %}" data-toggle="modal" data-target="#add-perm-form-modal" class="pull-right btn btn-success">Add permission</a>
 {% endblock %}
 
 {% block tabcontent %}
@@ -22,7 +20,7 @@
 
     <div class="page-header">
       <h1>
-        {% if perm %}
+        {% if permission %}
         Edit permission
         {% else %}
         Add permission

templates/permissions/project_perm_edit.html

@@ -21,7 +21,7 @@
 
     <div class="page-header">
       <h1>
-        {% if perm %}
+        {% if permission %}
         Edit permission
         {% else %}
         Add permission