Fix #104

topologie/templates/topologie/aff_stacks.html

@@ -31,58 +31,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <th>{% include "buttons/sort.html" with prefix='stack' col='id' text='ID' %}</th>
             <th>Détails</th>
             <th>Membres</th>
+            <th></th>
         </tr>
-    </thead>
-    {% for stack in stack_list %}
-    {% for switch in stack.switch_set.all %}
-    <tbody>
-        <tr class="active">
-            {% if forloop.first %}
-            <td rowspan="{{ stack.switch_set.all|length }}">{{stack.name}}</td>
-            <td rowspan="{{ stack.switch_set.all|length }}">{{stack.stack_id}}</td>
-            <td rowspan="{{ stack.switch_set.all|length }}" >{{stack.details}}</td>
-            {% endif %}
-            <td><a href="{% url 'topologie:index-port' switch.pk %}">{{switch}}</a></td>
-            {% if forloop.first %}
-            <td rowspan="{{ stack.switch_set.all|length }}">
-                <a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'stack' stack.pk %}">
-                    <i class="fa fa-history"></i>
-                </a>
-                {% can_edit stack %}
-                <a class="btn btn-primary btn-sm" role="button" title="Éditer" href="{% url 'topologie:edit-stack' stack.id %}">
-                    <i class="fa fa-edit"></i>
-                </a>
-		{% acl_end %}
-		{% can_delete stack %}
-                <a class="btn btn-danger btn-sm" role="button" title="Supprimer" href="{% url 'topologie:del-stack' stack.pk %}">
-                    <i class="fa fa-trash"></i>
-                </a>
-		{% acl_end %}
-            </td>
-            {% endif %}
-        </tr>
-        {% empty %}
-        <tr class="active">
-            <td>{{stack.name}}</td>
-            <td>{{stack.stack_id}}</td>
-            <td>{{stack.details}}</td>
-            <td>Aucun</td>
-            <td>
-                <a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'stack' stack.pk %}">
-                    <i class="fa fa-history"></i>
-                </a>
-                {% can_edit stack %}
-                <a class="btn btn-primary btn-sm" role="button" title="Éditer" href="{% url 'topologie:edit-stack' stack.id %}">
-                    <i class="fa fa-edit"></i>
-                </a>
-		{% acl_end %}
-		{% can_delete stack %}
-                <a class="btn btn-danger btn-sm" role="button" title="Supprimer" href="{% url 'topologie:del-stack' stack.pk %}">
-                    <i class="fa fa-trash"></i>
-                </a>
-                {% acl_end %}
-            </td>
-        {% endfor %}
-    </tbody>
-    {% endfor %}
+   </thead>
+   {% for stack in stack_list %}
+   <tr>
+       <td>{{ stack.name }}</td>
+       <td>{{stack.stack_id}}</td>
+       <td>{{stack.details}}</td>
+       <td>{% for switch in stack.switch_set.all %}<a href="{% url 'topologie:index-port' switch.pk %}">{{switch  }} </a>{% endfor %}</td>
+       <td class="text-right">
+	<a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'stack' stack.pk %}">
+	    <i class="fa fa-history"></i>
+	</a>
+	{% can_edit stack %}
+	<a class="btn btn-primary btn-sm" role="button" title="Éditer" href="{% url 'topologie:edit-stack' stack.id %}">
+	    <i class="fa fa-edit"></i>
+	</a>
+	{% acl_end %}
+	{% can_delete stack %}
+	<a class="btn btn-danger btn-sm" role="button" title="Supprimer" href="{% url 'topologie:del-stack' stack.pk %}">
+	    <i class="fa fa-trash"></i>
+	</a>
+	{% acl_end %}
+        </td>
+   </tr>
+   {% endfor %}
 </table>
+

topologie/templates/topologie/aff_switch_bay.html

@@ -43,7 +43,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        <td>{{switch_bay.name}}</td>
        <td>{{switch_bay.building}}</td>
        <td>{{switch_bay.info}}</td>
-       <td>{{switch_bay.switch_set.all |join:", "}}</td>
+       <td>{% for switch in switch_bay.switch_set.all %}<a href="{% url 'topologie:index-port' switch.pk %}">{{switch }} </a>{% endfor %}</td>
        <td class="text-right">
             <a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'switchbay' switch_bay.pk %}">
                 <i class="fa fa-history"></i>

topologie/views.py

@@ -352,6 +352,7 @@ def new_stack(request):
     if stack.is_valid():
         stack.save()
         messages.success(request, "Stack crée")
+        return redirect(reverse('topologie:index-physical-grouping'))
     return form(
         {'topoform': stack, 'action_name': 'Créer'},
         'topologie/topo.html',
@@ -367,7 +368,7 @@ def edit_stack(request, stack, **_kwargs):
     if stack.is_valid():
         if stack.changed_data:
             stack.save()
-            return redirect(reverse('topologie:index-physical-grouping'))
+        return redirect(reverse('topologie:index-physical-grouping'))
     return form(
         {'topoform': stack, 'action_name': 'Editer'},
         'topologie/topo.html',