rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-26 22:52:26 +00:00
Code Issues Releases Wiki Activity

Fix affichage stackw

Browse source
This commit is contained in:
Gabriel Detraz 2017-09-03 23:54:36 +02:00 committed by chirac
parent 047e495f67
commit 9d0f877832
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
topologie/models.py
View file

@ -60,8 +60,6 @@ class Stack(models.Model):
def clean(self): def clean(self):
if self.member_id_max < self.member_id_min: if self.member_id_max < self.member_id_min:
import traceback
traceback.print_exc()
raise ValidationError({'member_id_max':"L'id maximale est inférieure à l'id minimale"}) raise ValidationError({'member_id_max':"L'id maximale est inférieure à l'id minimale"})
class Switch(models.Model): class Switch(models.Model):

18
topologie/templates/topologie/aff_stacks.html
View file

@ -28,14 +28,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<th>Stack</th> <th>Stack</th>
<th>ID</th> <th>ID</th>
<th>Details</th> <th>Details</th>
<th>Membres</th>
</tr> </tr>
</thead> </thead>
{% for stack in stack_list %} {% for stack in stack_list %}
<tr> {% for switch in stack.switch_set.all %}
<td>{{stack.name}}</td> <tr class="active">
<td>{{stack.stack_id}}</td> {% if forloop.first %}
<td>{{stack.details}}</td> <td rowspan="{{ stack.switch_set.all|length }}">{{stack.name}}</td>
<td class="text-right"> <td rowspan="{{ stack.switch_set.all|length }}">{{stack.stack_id}}</td>
<td rowspan="{{ stack.switch_set.all|length }}" >{{stack.details}}</td>
{% endif %}
<td>{{switch}}</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 %}"> <a class="btn btn-info btn-sm" role="button" title="Historique" href="{% url 'topologie:history' 'stack' stack.pk %}">
<i class="glyphicon glyphicon-time"></i> <i class="glyphicon glyphicon-time"></i>
</a> </a>
@ -48,6 +54,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</a> </a>
{% endif %} {% endif %}
</td> </td>
{% endif %}
</tr> </tr>
{% endfor %} {% endfor %}
{% endfor %}
</table> </table>