diff --git a/project/models.py b/project/models.py
index 76345a0e6..60ce3d93b 100644
--- a/project/models.py
+++ b/project/models.py
@@ -11,7 +11,6 @@ from datetime import date
from django.apps import apps
from django.core.exceptions import ValidationError
from django.db import models
-from django.templatetags.static import static
from django.urls import reverse, reverse_lazy
from django.utils import timezone
from django.utils.html import format_html
@@ -128,14 +127,12 @@ class Project(HorillaModel):
def get_document_html(self):
if self.document:
document_url = self.document.url
- image_url = static("images/ui/project/document.png")
return format_html(
''
''
"  View"
"",
document_url,
- image_url,
)
def redirect(self):
@@ -418,6 +415,22 @@ class Task(HorillaModel):
url = reverse("task-detail-view", kwargs={"pk": self.pk})
return url
+ def card_view_subtitle(self):
+ """
+ subtitle for card view
+ """
+ col = format_html(
+ """
+
Project Name : {}
+ Stage Name : {}
+ End date : {}
+ """,
+ self.if_project(),
+ self.stage,
+ self.end_date,
+ )
+ return col
+
def status_column(self):
"""
to get status
@@ -430,7 +443,9 @@ class Task(HorillaModel):
"""
managers = self.task_managers.all()
if managers:
- managers_name_string = "
".join([str(manager) for manager in managers])
+ managers_name_string = ", ".join(
+ [str(manager.get_full_name()) for manager in managers]
+ )
return managers_name_string
else:
return ""
@@ -441,7 +456,9 @@ class Task(HorillaModel):
"""
members = self.task_members.all()
if members:
- members_name_string = "
".join([str(member) for member in members])
+ members_name_string = ", ".join(
+ [str(member.get_full_name()) for member in members]
+ )
return members_name_string
else:
return ""
@@ -450,21 +467,6 @@ class Task(HorillaModel):
"""
This method for get custom column for action.
"""
- # request = getattr(_thread_locals, "request", None)
- # is_task_manager = self.task_manager == request.user
- # print(self.title)
- # is_project_manager = self.project.manager == request.user if self.project else False
- # print(self.project)
- # has_permission = request.user.has_perm('project.view_task') # Replace 'your_app' with your app name
-
- # if is_task_manager or is_project_manager or has_permission:
- # return render_template(
- # "cbv/tasks/task_actions.html",
- # {"instance": self}
- # )
- # else:
- # return ""
-
return render_template(
path="cbv/tasks/task_actions.html",
context={"instance": self},