Skip to content

Zb branch #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Zb branch #268

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4b5fd6
updated lines that exceeded 79 characters, removed duplicate lines.
ZakheleNdlovu Aug 21, 2025
5418e5b
fixed indentation in function do()
ZakheleNdlovu Aug 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions tasks/views/create_completed_subtask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,33 @@ def check_subtasks(object_id: int, request: WSGIRequest) -> str:
responsible=request.user
).aggregate(
active_subtask=Count('pk', filter=Q(stage__active=True)),
closed_subtasks=Count('pk', filter=Q(stage__active=False, hide_main_task=True))
closed_subtasks=Count(
'pk',
filter=Q(stage__active=False, hide_main_task=True)
)
)
if data['active_subtask'] or data['closed_subtasks']:
url = reverse('site:tasks_task_changelist')
redirect_url = url
if data['active_subtask']:
redirect_url = f"{url}?task__id__exact={object_id}&responsible={request.user.username}"
redirect_url = (
f"{url}?task__id__exact={object_id}"
f"&responsible={request.user.username}"
)
messages.warning(
request,
_("The task cannot be marked as completed because you have an active subtask.")
)
return redirect_url


def create_completed_subtask(request: WSGIRequest, object_id: int) -> HttpResponseRedirect:
def create_completed_subtask(
request: WSGIRequest,
object_id: int
) -> HttpResponseRedirect:
redirect_url = check_subtasks(object_id, request) # NOQA
if redirect_url:
return HttpResponseRedirect(redirect_url)

add_subtask_url = TaskAdmin.get_add_subtask_url(object_id)
cs = CreateSubtask()
err = cs.do(add_subtask_url, request.user)
Expand Down Expand Up @@ -88,8 +96,6 @@ def email_subtask_completion(request: WSGIRequest, token: str, object_id: int
@skip("This is not a test")
class CreateSubtask(TestCase):
"""Creates a completed subtask."""


@override_settings(
SECURE_HSTS_SECONDS=0,
SECURE_SSL_REDIRECT=False,
Expand All @@ -116,13 +122,13 @@ def do(self, url, user) -> str:
self.assertEqual(response.status_code, 200, response.reason_phrase)
form = response.context_data
if 'adminform' in form:
err = _("An error occurred while creating the subtask. Contact the CRM Administrator.")
err = _(
"An error occurred while creating the subtask. Contact the CRM Administrator.")
mail_admins(
"Exception: CreateSubtask.do()",
f'''
\nUser: {user}
\nException: {form['adminform'].errors.as_text()}''',
fail_silently=False,
)

return err
return err