Skip to content

Commit 41eff91

Browse files
szabozoltan69szabozoltan69
authored
Merge pull request #1396 from IFRCGo/feature/wikiJsLinksAdminPage
Admin page - WikiJS Links
2 parents 0abe1d7 + 8b4b49a commit 41eff91

16 files changed

+108
-26
lines changed

‎api/admin.py‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,9 @@ def appeals(self, instance):
208208
appeals.short_description = 'Appeals'
209209

210210
# To add the 'Notify subscribers now' button
211-
change_form_template = "admin/emergency_changeform.html"
211+
# WikiJS links added
212+
change_form_template = "admin/emergency_change_form.html"
213+
change_list_template = "admin/emergency_change_list.html"
212214

213215
# Overwriting readonly fields for Edit mode
214216
def changeform_view(self, request, *args, **kwargs):
@@ -292,6 +294,9 @@ class FieldReportAdmin(CompareVersionAdmin, RegionRestrictedAdmin, TranslationAd
292294
readonly_fields = ('report_date', 'created_at', 'updated_at')
293295
list_filter = [MembershipFilter]
294296
actions = ['create_events', 'export_field_reports', ]
297+
# WikiJS links added
298+
change_form_template = "admin/fieldreport_change_form.html"
299+
change_list_template = "admin/fieldreport_change_list.html"
295300

296301
def create_events(self, request, queryset):
297302
for report in queryset:
@@ -370,6 +375,10 @@ class AppealAdmin(CompareVersionAdmin, RegionRestrictedAdmin, TranslationAdmin):
370375
actions = ['create_events', 'confirm_events']
371376
autocomplete_fields = ('event', 'country',)
372377

378+
# WikiJS links added
379+
change_form_template = "admin/appeal_change_form.html"
380+
change_list_template = "admin/appeal_change_list.html"
381+
373382
def create_events(self, request, queryset):
374383
for appeal in queryset:
375384
event = models.Event.objects.create(
@@ -595,6 +604,10 @@ class SituationReportAdmin(CompareVersionAdmin, RegionRestrictedAdmin, Translati
595604
region_in = 'event__regions__in'
596605
autocomplete_fields = ('event',)
597606

607+
# WikiJS links added
608+
change_form_template = "admin/situationreport_change_form.html"
609+
change_list_template = "admin/situationreport_change_list.html"
610+
598611
def get_queryset(self, request):
599612
return super().get_queryset(request).select_related('type', 'event')
600613

‎api/templates/admin/appeal_change_form.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% extends "admin/change_form.html" %}
2+
{% block object-tools-items %}
3+
<li>
4+
<a href="https://go-wiki.ifrc.org/en/admin_guide/Appeals" target="_blank" class="historylink">?</a>
5+
</li>
6+
{{ block.super }}
7+
{% endblock %}

‎api/templates/admin/appeal_change_list.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% extends "reversion/change_list.html" %}
2+
{% block object-tools-items %}
3+
<li>
4+
<a href="https://go-wiki.ifrc.org/en/admin_guide/Appeals" target="_blank" class="historylink">?</a>
5+
</li>
6+
{{ block.super }}
7+
{% endblock %}

‎api/templates/admin/base_site.html‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ <h1 id="site-name">
1212
</a>
1313
{% if HAVING_INGEST_ISSUE and request.user.is_superuser %}
1414
<span title="Ingest issue – please check erroneous api/CronJob item">
15-
<a
16-
href="/api/cronjob/{{ INGEST_ISSUE_ID }}"
15+
<a href="/api/cronjob/{{ INGEST_ISSUE_ID }}"
1716
style="padding-left: 10px; color: red; font-size: 1.8rem; text-shadow: 0px 0px 16px #f40, 0px 0px 6px #f40;"
1817
>&#9888;</a>
1918
</span>
@@ -25,6 +24,9 @@ <h1 id="site-name">
2524
<form action="{% url 'set_language' %}" method="post">
2625
{% csrf_token %}
2726
<input name="next" type="hidden" value="{{ redirect_to }}">
27+
<span>
28+
<a href="https://go-wiki.ifrc.org/en/admin_guide/admin_site_overview" target="_blank" style="text-decoration: none;border-radius: 50%; color: rgb(255, 255, 255); background-color: #79aec8; font-size: 1rem; padding: 3px 9px;">?</a>
29+
</span>
2830
<select name="language" style="border: 1px solid rgba(34,36,38,.15);">
2931
{% get_current_language as LANGUAGE_CODE %}
3032
{% get_available_languages as LANGUAGES %}
@@ -39,9 +41,6 @@ <h1 id="site-name">
3941
</form>
4042
{% endblock %}
4143

42-
4344
{% block extrastyle %}
44-
{{block.super}}
45-
{# Didn't dare to remove this part, not sure if it does anything as it is right now #}
46-
{# use PRODUCTION_URL to create logic //PRODUCTION_URL// #}
45+
{{block.super}}
4746
{% endblock %}

‎api/templates/admin/emergency_change_form.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% extends "admin/change_form.html" %}
2+
{% block object-tools-items %}
3+
<li>
4+
<a href="https://go-wiki.ifrc.org/en/admin_guide/emergencies" target="_blank" class="historylink">?</a>
5+
</li>
6+
{{ block.super }}
7+
{% endblock %}

‎api/templates/admin/emergency_change_list.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% extends "reversion/change_list.html" %}
2+
{% block object-tools-items %}
3+
<li>
4+
<a href="https://go-wiki.ifrc.org/en/admin_guide/emergencies" target="_blank" class="historylink">?</a>
5+
</li>
6+
{{ block.super }}
7+
{% endblock %}

‎api/templates/admin/emergency_changeform.html‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎api/templates/admin/fieldreport_change_form.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% extends "admin/change_form.html" %}
2+
{% block object-tools-items %}
3+
<li>
4+
<a href="https://go-wiki.ifrc.org/en/admin_guide/field_report" target="_blank" class="historylink">?</a>
5+
</li>
6+
{{ block.super }}
7+
{% endblock %}

‎api/templates/admin/fieldreport_change_list.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% extends "reversion/change_list.html" %}
2+
{% block object-tools-items %}
3+
<li>
4+
<a href="https://go-wiki.ifrc.org/en/admin_guide/field_report" target="_blank" class="historylink">?</a>
5+
</li>
6+
{{ block.super }}
7+
{% endblock %}

‎api/templates/admin/situationreport_change_form.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% extends "admin/change_form.html" %}
2+
{% block object-tools-items %}
3+
<li>
4+
<a href="https://go-wiki.ifrc.org/en/admin_guide/situation_report" target="_blank" class="historylink">?</a>
5+
</li>
6+
{{ block.super }}
7+
{% endblock %}

0 commit comments

Comments
 (0)