diff --git a/civicfix/civicfix/settings.py b/civicfix/civicfix/settings.py index 8579dc8..cabcaf8 100644 --- a/civicfix/civicfix/settings.py +++ b/civicfix/civicfix/settings.py @@ -101,7 +101,6 @@ cloudinary.config( api_secret = os.getenv("API_SECRET") ) -MEDIA_URL = f"https://res.cloudinary.com/{os.getenv('CLOUD_NAME')}/" DEFAULT_FILE_STORAGE = 'cloudinary_storage.storage.MediaCloudinaryStorage' # Auth redirects diff --git a/civicfix/core/templates/issues/manage_issues.html b/civicfix/core/templates/issues/manage_issues.html index 4d990c0..3c189eb 100644 --- a/civicfix/core/templates/issues/manage_issues.html +++ b/civicfix/core/templates/issues/manage_issues.html @@ -9,70 +9,73 @@
{% if issues %} - - - - - - - - - - - - - {% for issue in issues %} - - - - - - - + + {% endfor %} + +
No.TitleReported ByStatusCreated AtActions
{{ forloop.counter }}{{ issue.title }}{{ issue.reporter.username }} - {% if issue.status == "reported" %} - Reported - {% elif issue.status == "acknowledged" %} - Acknowledged - {% elif issue.status == "in_progress" %} - In Progress - {% elif issue.status == "resolved" %} - Resolved - {% else %} - Unknown - {% endif %} - {{ issue.created_at|date:"M d, Y H:i" }} - {% if issue.department %} - {{ issue.department.name }} - {% else %} - -
- {% csrf_token %} - - - -
+ + + + + + + + + + + + + {% for issue in issues %} + + + + + + + - - {% endfor %} - -
No.TitleReported ByStatusCreated AtActions
{{ forloop.counter }}{{ issue.title }}{{ issue.reporter.username }} + {% if issue.status == "reported" %} + Reported + {% elif issue.status == "acknowledged" %} + Acknowledged + {% elif issue.status == "in_progress" %} + In Progress + {% elif issue.status == "resolved" %} + Resolved + {% else %} + Unknown + {% endif %} + {{ issue.created_at|date:"M d, Y H:i" }} + {% if issue.department %} + {{ issue.department.name }} + {% else %} + +
+ {% csrf_token %} + + + +
- - - Report Fake - - {% endif %} -
+ + + Report Fake + + + Delete + + {% endif %} +
{% else %} -

No issues reported yet.

+

No issues reported yet.

{% endif %}
-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/civicfix/core/urls.py b/civicfix/core/urls.py index 088018e..a240a4a 100644 --- a/civicfix/core/urls.py +++ b/civicfix/core/urls.py @@ -26,4 +26,5 @@ urlpatterns = [ path('unban-user//', views.unban_user, name='unban_user'), path('issues//delete_fake/', views.delete_fake_issue, name='delete_fake_issue'), path("reports/", views.superadmin_reports, name="superadmin_reports"), + path('delete-issue//', views.delete_issue, name='delete_issue'), ] \ No newline at end of file diff --git a/civicfix/core/views.py b/civicfix/core/views.py index c416ab0..aaa4af8 100644 --- a/civicfix/core/views.py +++ b/civicfix/core/views.py @@ -384,6 +384,14 @@ def superadmin_reports(request): } return render(request, "core/superadmin_reports.html", context) +@login_required +@user_passes_test(superadmin_check) +def delete_issue(request, issue_id): + issue = get_object_or_404(Issue, id=issue_id) + issue.delete() + messages.success(request, "Issue deleted successfully.") + return redirect('manage_issues') + def resolver_check(user): return user.is_resolver