Merge branch 'feature-template-acl-names' into 'master'

Feature Template Acl Names

Add full names to the ACL table in templates

Also a minor fix

Also partially fixing #172

circle/dashboard/static/dashboard/dashboard.css

@@ -705,6 +705,7 @@ textarea[name="list-new-namelist"] {
 
 #group-detail-user-table td:nth-child(2) a,
 #group-detail-perm-table td:nth-child(2) a, 
+#template-access-table td:nth-child(2) a, 
 #vm-access-table td:nth-child(2) a, 
 .no-style-link, .no-style-link:hover {
   color: #555 !important;

circle/dashboard/templates/dashboard/index-templates.html

@@ -11,7 +11,7 @@
     <div id="dashboard-template-list">
       {% for t in templates %}
       <a href="{% url "dashboard.views.template-detail" pk=t.pk %}" class="list-group-item
-        {% if forloop.last and nodes|length < 5 %} list-group-item-last{% endif %}">
+        {% if forloop.last and templates|length < 5 %} list-group-item-last{% endif %}">
         <span class="index-template-list-name">
           <i class="icon-{{ t.os_type }}"></i> {{ t.name }} 
         </span>

circle/dashboard/templates/dashboard/template-edit.html

@@ -37,48 +37,62 @@
                 <th>{% trans "Who" %}</th>
                 <th>{% trans "What" %}</th>
                 <th><i class="icon-remove"></i></th>
-            </tr></thead>
+              </tr>
+            </thead>
             <tbody>
-                {% for i in acl.users %}
-                <tr>
-                  <td><i class="icon-user"></i></td><td>{{i.user}}</td>
-                  <td>
-                    <select class="form-control" name="perm-u-{{i.user.id}}">
-                      {% for id, name in acl.levels %}
-                      <option{%if id = i.level%} selected="selected"{%endif%} value="{{id}}">{{name}}</option>
-                      {% endfor %}
-                    </select>
-                  </td>
-                  <td>
-                    <input type="checkbox" name="remove-u-{{i.user.id}}" title="{% trans "Remove" %}"/>
-                  </td>
-                </tr>
-                {% endfor %}
-                {% for i in acl.groups %}
-                <tr>
-                  <td><i class="icon-group"></i></td><td>{{i.group}}</td>
-                  <td>
-                    <select class="form-control" name="perm-g-{{i.group.id}}">
-                      {% for id, name in acl.levels %}
-                      <option{%if id = i.level%} selected="selected"{%endif%} value="{{id}}">{{name}}</option>
-                      {% endfor %}
-                    </select>
-                  </td>
-                  <td>
-                    <input type="checkbox" name="remove-g-{{i.group.id}}" title="{% trans "Remove" %}"/>
-                  </td>
-                </tr>
-                {% endfor %}
-                <tr><td><i class="icon-plus"></i></td>
-                    <td><input type="text" class="form-control" name="perm-new-name"
-                        placeholder="{% trans "Name of group or user" %}"></td>
-                    <td><select class="form-control" name="perm-new">
-                            {% for id, name in acl.levels %}
-                            <option value="{{id}}">{{name}}</option>
-                            {% endfor %}
-                    </select></td><td></td>
-                </tr>
-          </tbody>
+              {% for i in acl.users %}
+              <tr>
+                <td>
+                  <i class="icon-user"></i>
+                </td>
+                <td>
+                  <a href="{% url "dashboard.views.profile" username=i.user.username %}"
+                    title="{{ i.user.username }}">
+                    {% include "dashboard/_display-name.html" with user=i.user show_org=True %}
+                  </a>
+                </td>
+                <td>
+                  <select class="form-control" name="perm-u-{{i.user.id}}">
+                    {% for id, name in acl.levels %}
+                    <option{%if id = i.level%} selected="selected"{%endif%} value="{{id}}">{{name}}</option>
+                    {% endfor %}
+                  </select>
+                </td>
+                <td>
+                  <input type="checkbox" name="remove-u-{{i.user.id}}" title="{% trans "Remove" %}"/>
+                </td>
+              </tr>
+              {% endfor %}
+              {% for i in acl.groups %}
+              <tr>
+                <td><i class="icon-group"></i></td>
+                <td>
+                  <a href="{% url "dashboard.views.group-detail" pk=i.group.pk %}">
+                    {{i.group}}
+                  </a>
+                </td>
+                <td>
+                  <select class="form-control" name="perm-g-{{i.group.id}}">
+                    {% for id, name in acl.levels %}
+                    <option{%if id = i.level%} selected="selected"{%endif%} value="{{id}}">{{name}}</option>
+                    {% endfor %}
+                  </select>
+                </td>
+                <td>
+                  <input type="checkbox" name="remove-g-{{i.group.id}}" title="{% trans "Remove" %}"/>
+                </td>
+              </tr>
+              {% endfor %}
+              <tr><td><i class="icon-plus"></i></td>
+                  <td><input type="text" class="form-control" name="perm-new-name"
+                      placeholder="{% trans "Name of group or user" %}"></td>
+                  <td><select class="form-control" name="perm-new">
+                          {% for id, name in acl.levels %}
+                          <option value="{{id}}">{{name}}</option>
+                          {% endfor %}
+                  </select></td><td></td>
+              </tr>
+            </tbody>
           </table>
           <div class="form-actions">
             <button type="submit" class="btn btn-success">{% trans "Save" %}</button>

circle/dashboard/views.py

@@ -915,7 +915,9 @@ class TemplateAclUpdateView(AclUpdateView):
             post_for_disk['perm-new'] = 'user'
             request.POST = post_for_disk
             for d in template.disks.all():
+                self.set_levels(request, d)
                 self.add_levels(request, d)
+                self.remove_levels(request, d)
 
         return redirect(template)