|
9 | 9 | from django.contrib import messages |
10 | 10 | from django.core.mail import EmailMessage |
11 | 11 | from django.db.models.query import QuerySet |
12 | | -from django.forms.models import ModelForm |
13 | 12 | from django.http import HttpRequest, HttpResponse, HttpResponseRedirect |
14 | | -from django.shortcuts import redirect |
15 | 13 | from django.urls import reverse_lazy |
16 | 14 | from django.views.generic import TemplateView |
17 | 15 | from django.views.generic.edit import FormView, UpdateView |
|
26 | 24 | from .forms import ( |
27 | 25 | ActiveQAAuditorUpdateForm, |
28 | 26 | AMPContactAdminForm, |
29 | | - AMPIssueReportForm, |
30 | 27 | BulkURLSearchForm, |
31 | 28 | FooterLinkFormset, |
32 | 29 | FooterLinkOneExtraFormset, |
|
44 | 41 | get_report_progress_metrics, |
45 | 42 | get_report_yearly_metrics, |
46 | 43 | ) |
47 | | -from .models import ( |
48 | | - ChangeToPlatform, |
49 | | - FooterLink, |
50 | | - FrequentlyUsedLink, |
51 | | - IssueReport, |
52 | | - Platform, |
53 | | -) |
| 44 | +from .models import ChangeToPlatform, FooterLink, FrequentlyUsedLink, Platform |
54 | 45 | from .platform_template_view import PlatformTemplateView |
55 | 46 | from .utils import extract_domain_from_url, get_platform_settings, sanitise_domain |
56 | 47 |
|
@@ -135,63 +126,6 @@ def send_mail(self, cleaned_data: dict[str, str]) -> None: |
135 | 126 | email.send() |
136 | 127 |
|
137 | 128 |
|
138 | | -class IssueReportView(FormView): |
139 | | - """ |
140 | | - Save user feedback |
141 | | - """ |
142 | | - |
143 | | - form_class: type[AMPIssueReportForm] = AMPIssueReportForm |
144 | | - template_name: str = "common/issue_report.html" |
145 | | - success_url: str = reverse_lazy("dashboard:home") |
146 | | - |
147 | | - def get(self, request, *args, **kwargs): |
148 | | - """Populate form""" |
149 | | - target_page_url: str = self.request.GET.get("page_url", "") |
150 | | - target_page_title: str = self.request.GET.get("page_title", "Unknown page") |
151 | | - |
152 | | - goal_description: str = self.request.GET.get("goal_description", "") |
153 | | - issue_description: str = self.request.GET.get("issue_description", "") |
154 | | - self.form: AMPIssueReportForm = self.form_class( |
155 | | - { |
156 | | - "page_url": target_page_url, |
157 | | - "page_title": target_page_title, |
158 | | - "goal_description": goal_description, |
159 | | - "issue_description": issue_description, |
160 | | - } |
161 | | - ) |
162 | | - self.form.is_valid() |
163 | | - return super().get(request, *args, **kwargs) |
164 | | - |
165 | | - def get_context_data(self, **kwargs) -> dict[str, Any]: |
166 | | - """Add field values into context""" |
167 | | - context: dict[str, Any] = super().get_context_data(**kwargs) |
168 | | - context["form"] = self.form |
169 | | - return context |
170 | | - |
171 | | - def form_valid(self, form: ModelForm): |
172 | | - """Process contents of valid form""" |
173 | | - issue_report: IssueReport = form.save(commit=False) |
174 | | - issue_report.created_by = self.request.user |
175 | | - issue_report.save() |
176 | | - self.send_mail(issue_report) |
177 | | - return redirect(issue_report.page_url) |
178 | | - |
179 | | - def send_mail(self, issue_report: IssueReport) -> None: |
180 | | - email: EmailMessage = EmailMessage( |
181 | | - subject=f"Platform issue on {issue_report.page_title}", |
182 | | - body=f"""Reported by: {issue_report.created_by} |
183 | | -
|
184 | | -URL: https://{self.request.get_host()}{issue_report.page_url} |
185 | | -
|
186 | | -Goal: {issue_report.goal_description} |
187 | | -
|
188 | | -Issue: {issue_report.issue_description}""", |
189 | | - from_email=self.request.user.email, |
190 | | - to=[settings.CONTACT_ADMIN_EMAIL], |
191 | | - ) |
192 | | - email.send() |
193 | | - |
194 | | - |
195 | 129 | class ActiveQAAuditorUpdateView(UpdateView): |
196 | 130 | """ |
197 | 131 | Update active QA auditor |
|
0 commit comments