Skip to content

Commit ec3e193

Browse files
author
Hugo
authored
Merge pull request #8 from HugoPouliquen/tp-remove_star_function
[MASTER] Remove star function
2 parents d34c84a + 8c56925 commit ec3e193

File tree

2 files changed

+5
-16
lines changed

2 files changed

+5
-16
lines changed

incidents/templates/dashboard/index.html

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
{% endblock %}
1111

1212
{% block content %}
13-
<h4>{% trans "Starred Incidents" %}</h4>
14-
15-
<div id='starred_incidents' class='incident_display' data-url="{% url 'dashboard:starred' %}">
16-
{% trans "Loading ..." %}
17-
</div>
1813

1914
<div class='tabbable'>
2015
<ul class='nav nav-tabs'>
@@ -91,11 +86,11 @@ <h4>{% trans "Starred Incidents" %}</h4>
9186
{% trans "Loading ..." %}
9287
</div>-->
9388

94-
89+
9590
<div class='tab-pane incident_display table-responsive' id='tab_assigned' data-url="{% url 'dashboard:assigned' %}">
9691
{% trans "Loading ..." %}
9792
</div>
98-
93+
9994

10095
{% plugin_point 'dashboard_tab_content' %}
10196
</div>

incidents/templates/management/table.html

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{% trans "Last Action" as t_lastaction %}
1414
{% trans "None" as t_none %}
1515
<tr>
16-
{% if incident_show_id %}<th>ID</th>{% endif %}
16+
<th>ID</th>
1717
{% include 'events/column.html' with name=t_date field='date' %}
1818
<th></th>
1919
{% include 'events/column.html' with name=t_category field='category' %}
@@ -30,16 +30,10 @@
3030
{% for incident in incident_list %}
3131
{% has_perm 'incidents.handle_incidents' obj=incident as can_handle_incident %}
3232
<tr class='{{ incident.status }}'>
33-
{% if incident_show_id %}<td>{{ incident|object_id }}</td>{% endif %}
33+
<td>{{ incident|object_id }}</td>
3434
<td class='incident_date_column'>{{ incident.date|date:'Y-m-d' }}</td>
3535
<td>
36-
{% if can_handle_incident %}<a href="{% url 'ajax:toggle_star' incident.id %}" class='star'>{%endif%}
37-
{% if incident.is_starred %}
38-
<i class='glyphicon glyphicon-star star'></i>
39-
{% else %}
40-
<i class='glyphicon glyphicon-star-empty star'></i>
41-
{% endif %}
42-
{% if can_handle_incident %}</a>{%endif%}
36+
4337
</td>
4438
<td>{{ incident.category }}</td>
4539
{% if incident.is_incident %}

0 commit comments

Comments
 (0)