Merge pull request #1805 from IFRCGo/develop

Some small hotfixes concerning Admin pages

Author: szabozoltan69

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.479
+
+### Added
+ - Add /admin to Admin page URL in references
+ - Add CompareVersionAdmin to some Admin pages
+
 ## 1.1.478
 
 ### Added
@@ -2231,7 +2237,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## 0.1.20
 
-[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.478...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.479...HEAD
+[1.1.479]: https://github.com/IFRCGo/go-api/compare/1.1.478...1.1.479
 [1.1.478]: https://github.com/IFRCGo/go-api/compare/1.1.477...1.1.478
 [1.1.477]: https://github.com/IFRCGo/go-api/compare/1.1.476...1.1.477
 [1.1.476]: https://github.com/IFRCGo/go-api/compare/1.1.475...1.1.476

api/admin.py

@@ -156,7 +156,7 @@ def queryset(self, request, queryset):
             return queryset.filter(auto_generated=True).filter(auto_generated_source__isnull=True)
 
 
-class DisasterTypeAdmin(TranslationAdmin, admin.ModelAdmin):
+class DisasterTypeAdmin(CompareVersionAdmin, TranslationAdmin, admin.ModelAdmin):
     search_fields = ('name',)
 
 

api/management/commands/index_and_notify.py

@@ -864,7 +864,7 @@ def check_ingest_issues(self, having_ingest_issue):
             send_notification('API monitor – ingest issues!',
                               ['[email protected]'],  # Could be an ENV var
                               'Ingest issue(s) occured, one of them is ' + ingestor_name +
-                              ', via CronJob log record id: https://' + settings.BASE_URL + '/api/cronjob/' +
+                              ', via CronJob log record id: https://' + settings.BASE_URL + '/admin/api/cronjob/' +
                               str(ingest_issue_id) + '. Please fix it ASAP.',
                               'Ingestion error')
             logger.info('Ingest issue occured, e.g. by ' + ingestor_name +

api/templates/admin/base_site.html

@@ -12,7 +12,7 @@ <h1 id="site-name">
     </a>
     {% if HAVING_INGEST_ISSUE and request.user.is_superuser %}
         <span title="Ingest issue – please check erroneous api/CronJob item">
-            <a href="/api/cronjob/{{ INGEST_ISSUE_ID }}"
+            <a href="/admin/api/cronjob/{{ INGEST_ISSUE_ID }}"
                 style="padding-left: 10px; color: red; font-size: 1.8rem; text-shadow: 0px 0px 16px #f40, 0px 0px 6px #f40;"
             >&#9888;</a>
         </span>

api/views.py

@@ -493,9 +493,12 @@ def get(cls, request):
         r = FieldReport.objects.filter(description__contains="base64").count()
         u = FlashUpdate.objects.filter(situational_overview__contains="base64").count()
         c = CronJob.objects.filter(status=2).count()
+        f = Event.objects.filter(disaster_start_date__gt=timezone.now()).count()
+
         res = ES_CLIENT.cluster.health()
         res["--------------------------------"] = "----------"
         res["base64_img"] = e + s + r + u
+        res["events_in_future"] = f
         res["cronjob_err"] = c
         res["maintenance_mode"] = settings.DJANGO_READ_ONLY
         res["git_last_tag"] = settings.LAST_GIT_TAG

deployments/admin.py

@@ -36,18 +36,18 @@ def get_queryset(self, request):
         return super().get_queryset(request).select_related('national_society_country')
 
 
-class SectorAdmin(admin.ModelAdmin):
+class SectorAdmin(CompareVersionAdmin, admin.ModelAdmin):
     model = models.Sector
     search_fields = ('title',)
 
 
-class SectorTagAdmin(admin.ModelAdmin):
+class SectorTagAdmin(CompareVersionAdmin, admin.ModelAdmin):
     model = models.SectorTag
     search_fields = ('title',)
 
 
 @admin.register(models.ERU)
-class ERUAdmin(admin.ModelAdmin):
+class ERUAdmin(CompareVersionAdmin, admin.ModelAdmin):
     search_fields = ('national_society_country__name',)
 
 
@@ -269,13 +269,13 @@ class EmergencyProjectActivityActionInline(admin.TabularInline):
 
 
 @admin.register(models.EmergencyProjectActivityAction)
-class EmergencyProjectActivityActionAdmin(admin.ModelAdmin):
+class EmergencyProjectActivityActionAdmin(CompareVersionAdmin, admin.ModelAdmin):
     search_fields = ('title',)
     inlines = (EmergencyProjectActivityActionSupplyInline,)
 
 
 @admin.register(models.EmergencyProjectActivitySector)
-class EmergencyProjectActivitySectorAdmin(admin.ModelAdmin):
+class EmergencyProjectActivitySectorAdmin(CompareVersionAdmin, admin.ModelAdmin):
     search_fields = ('title',)
     inlines = (EmergencyProjectActivityActionInline,)
 
@@ -287,7 +287,7 @@ class EmergencyProjectActivityInline(admin.TabularInline):
 
 
 @admin.register(models.EmergencyProject)
-class EmergencyProjectAdmin(admin.ModelAdmin):
+class EmergencyProjectAdmin(CompareVersionAdmin, admin.ModelAdmin):
     search_fields = ('title',)
     autocomplete_fields = (
         'created_by', 'modified_by', 'event', 'reporting_ns', 'deployed_eru',

main/__init__.py

@@ -3,4 +3,4 @@
 from .celery import app as celery_app
 
 __all__ = ['celery_app']
-__version__ = '1.1.478'
+__version__ = '1.1.479'